diff --git a/.idea/.name b/.idea/.name
index fb4eb64..67e35c5 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-ProgressActivity
\ No newline at end of file
+progress-activity
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d945063..132914d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1a3eaff..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index d1da431..375d91b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/ProgressActivity.iml" filepath="$PROJECT_DIR$/ProgressActivity.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/library.iml" filepath="$PROJECT_DIR$/library/library.iml" />
+      <module fileurl="file://$PROJECT_DIR$/progress-activity.iml" filepath="$PROJECT_DIR$/progress-activity.iml" />
       <module fileurl="file://$PROJECT_DIR$/sample/sample.iml" filepath="$PROJECT_DIR$/sample/sample.iml" />
     </modules>
   </component>
diff --git a/library/build.gradle b/library/build.gradle
index c697ad9..23e2a23 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: "com.android.library"
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
@@ -14,5 +14,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.1'
-}
+    compile 'com.android.support:appcompat-v7:23.0.1'
+}
\ No newline at end of file
diff --git a/library/library.iml b/library/library.iml
index 9d5e599..8c899d1 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ProgressActivity" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="progress-activity" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -65,6 +65,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -72,8 +73,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -86,13 +87,18 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/release" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/library/src/main/java/com/vlonjatg/progressactivity/ProgressActivity.java b/library/src/main/java/com/vlonjatg/progressactivity/ProgressActivity.java
index ac47477..d0b162a 100644
--- a/library/src/main/java/com/vlonjatg/progressactivity/ProgressActivity.java
+++ b/library/src/main/java/com/vlonjatg/progressactivity/ProgressActivity.java
@@ -27,6 +27,11 @@ public class ProgressActivity extends RelativeLayout {
     private static final String TAG_EMPTY = "ProgressActivity.TAG_EMPTY";
     private static final String TAG_ERROR = "ProgressActivity.TAG_ERROR";
 
+    final String CONTENT = "type_content";
+    final String LOADING = "type_loading";
+    final String EMPTY = "type_empty";
+    final String ERROR = "type_error";
+
     LayoutInflater inflater;
     View view;
     LayoutParams layoutParams;
@@ -68,7 +73,7 @@ public class ProgressActivity extends RelativeLayout {
     int errorStateButtonTextColor;
     int errorStateBackgroundColor;
 
-    private State state = State.CONTENT;
+    private String state = CONTENT;
 
     public ProgressActivity(Context context) {
         super(context);
@@ -162,7 +167,7 @@ public void addView(@NonNull View child, int index, ViewGroup.LayoutParams param
      * Hide all other states and show content
      */
     public void showContent() {
-        switchState(State.CONTENT, null, null, null, null, null, Collections.<Integer>emptyList());
+        switchState(CONTENT, null, null, null, null, null, Collections.<Integer>emptyList());
     }
 
     /**
@@ -171,14 +176,14 @@ public void showContent() {
      * @param skipIds Ids of views not to show
      */
     public void showContent(List<Integer> skipIds) {
-        switchState(State.CONTENT, null, null, null, null, null, skipIds);
+        switchState(CONTENT, null, null, null, null, null, skipIds);
     }
 
     /**
      * Hide content and show the progress bar
      */
     public void showLoading() {
-        switchState(State.LOADING, null, null, null, null, null, Collections.<Integer>emptyList());
+        switchState(LOADING, null, null, null, null, null, Collections.<Integer>emptyList());
     }
 
     /**
@@ -187,7 +192,7 @@ public void showLoading() {
      * @param skipIds Ids of views to not hide
      */
     public void showLoading(List<Integer> skipIds) {
-        switchState(State.LOADING, null, null, null, null, null, skipIds);
+        switchState(LOADING, null, null, null, null, null, skipIds);
     }
 
     /**
@@ -198,7 +203,7 @@ public void showLoading(List<Integer> skipIds) {
      * @param emptyTextContent   Content of the empty view to show
      */
     public void showEmpty(Drawable emptyImageDrawable, String emptyTextTitle, String emptyTextContent) {
-        switchState(State.EMPTY, emptyImageDrawable, emptyTextTitle, emptyTextContent, null, null, Collections.<Integer>emptyList());
+        switchState(EMPTY, emptyImageDrawable, emptyTextTitle, emptyTextContent, null, null, Collections.<Integer>emptyList());
     }
 
     /**
@@ -210,7 +215,7 @@ public void showEmpty(Drawable emptyImageDrawable, String emptyTextTitle, String
      * @param skipIds Ids of views to not hide
      */
     public void showEmpty(Drawable emptyImageDrawable, String emptyTextTitle, String emptyTextContent, List<Integer> skipIds) {
-        switchState(State.EMPTY, emptyImageDrawable, emptyTextTitle, emptyTextContent, null, null, skipIds);
+        switchState(EMPTY, emptyImageDrawable, emptyTextTitle, emptyTextContent, null, null, skipIds);
     }
 
     /**
@@ -223,7 +228,7 @@ public void showEmpty(Drawable emptyImageDrawable, String emptyTextTitle, String
      * @param onClickListener    Listener of the error view button
      */
     public void showError(Drawable errorImageDrawable, String errorTextTitle, String errorTextContent, String errorButtonText, View.OnClickListener onClickListener) {
-        switchState(State.ERROR, errorImageDrawable, errorTextTitle, errorTextContent, errorButtonText, onClickListener, Collections.<Integer>emptyList());
+        switchState(ERROR, errorImageDrawable, errorTextTitle, errorTextContent, errorButtonText, onClickListener, Collections.<Integer>emptyList());
     }
 
     /**
@@ -237,7 +242,7 @@ public void showError(Drawable errorImageDrawable, String errorTextTitle, String
      * @param skipIds Ids of views to not hide
      */
     public void showError(Drawable errorImageDrawable, String errorTextTitle, String errorTextContent, String errorButtonText, View.OnClickListener onClickListener, List<Integer> skipIds) {
-        switchState(State.ERROR, errorImageDrawable, errorTextTitle, errorTextContent, errorButtonText, onClickListener, skipIds);
+        switchState(ERROR, errorImageDrawable, errorTextTitle, errorTextContent, errorButtonText, onClickListener, skipIds);
     }
 
     /**
@@ -245,7 +250,7 @@ public void showError(Drawable errorImageDrawable, String errorTextTitle, String
      *
      * @return State
      */
-    public State getState() {
+    public String getState() {
         return state;
     }
 
@@ -255,7 +260,7 @@ public State getState() {
      * @return boolean
      */
     public boolean isContent() {
-        return state == State.CONTENT;
+        return state.equals(CONTENT);
     }
 
     /**
@@ -264,7 +269,7 @@ public boolean isContent() {
      * @return boolean
      */
     public boolean isLoading() {
-        return state == State.LOADING;
+        return state.equals(LOADING);
     }
 
     /**
@@ -273,7 +278,7 @@ public boolean isLoading() {
      * @return boolean
      */
     public boolean isEmpty() {
-        return state == State.EMPTY;
+        return state.equals(EMPTY);
     }
 
     /**
@@ -282,10 +287,10 @@ public boolean isEmpty() {
      * @return boolean
      */
     public boolean isError() {
-        return state == State.ERROR;
+        return state.equals(ERROR);
     }
 
-    private void switchState(State state, Drawable drawable, String errorText, String errorTextContent,
+    private void switchState(String state, Drawable drawable, String errorText, String errorTextContent,
                              String errorButtonText, View.OnClickListener onClickListener, List<Integer> skipIds) {
         this.state = state;
 
@@ -331,90 +336,102 @@ private void switchState(State state, Drawable drawable, String errorText, Strin
     }
 
     private void setLoadingView() {
-        view = inflater.inflate(R.layout.progress_loading_view, null);
-        loadingStateRelativeLayout = (RelativeLayout) view.findViewById(R.id.loadingStateRelativeLayout);
-        loadingStateRelativeLayout.setTag(TAG_LOADING);
+        if (loadingStateRelativeLayout == null) {
+            view = inflater.inflate(R.layout.progress_loading_view, null);
+            loadingStateRelativeLayout = (RelativeLayout) view.findViewById(R.id.loadingStateRelativeLayout);
+            loadingStateRelativeLayout.setTag(TAG_LOADING);
 
-        loadingStateProgressBar = (ProgressBar) view.findViewById(R.id.loadingStateProgressBar);
+            loadingStateProgressBar = (ProgressBar) view.findViewById(R.id.loadingStateProgressBar);
 
-        loadingStateProgressBar.getLayoutParams().width = loadingStateProgressBarWidth;
-        loadingStateProgressBar.getLayoutParams().height = loadingStateProgressBarHeight;
-        loadingStateProgressBar.requestLayout();
+            loadingStateProgressBar.getLayoutParams().width = loadingStateProgressBarWidth;
+            loadingStateProgressBar.getLayoutParams().height = loadingStateProgressBarHeight;
+            loadingStateProgressBar.requestLayout();
 
-        //Set background color if not TRANSPARENT
-        if (loadingStateBackgroundColor != Color.TRANSPARENT) {
-            loadingStateRelativeLayout.setBackgroundColor(loadingStateBackgroundColor);
-        }
+            //Set background color if not TRANSPARENT
+            if (loadingStateBackgroundColor != Color.TRANSPARENT) {
+                loadingStateRelativeLayout.setBackgroundColor(loadingStateBackgroundColor);
+            }
 
-        layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT);
-        layoutParams.addRule(CENTER_IN_PARENT);
+            layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT);
+            layoutParams.addRule(CENTER_IN_PARENT);
 
-        addView(loadingStateRelativeLayout, layoutParams);
+            addView(loadingStateRelativeLayout, layoutParams);
+        } else {
+            loadingStateRelativeLayout.setVisibility(VISIBLE);
+        }
     }
 
     private void setEmptyView() {
-        view = inflater.inflate(R.layout.progress_empty_view, null);
-        emptyStateRelativeLayout = (RelativeLayout) view.findViewById(R.id.emptyStateRelativeLayout);
-        emptyStateRelativeLayout.setTag(TAG_EMPTY);
-
-        emptyStateImageView = (ImageView) view.findViewById(R.id.emptyStateImageView);
-        emptyStateTitleTextView = (TextView) view.findViewById(R.id.emptyStateTitleTextView);
-        emptyStateContentTextView = (TextView) view.findViewById(R.id.emptyStateContentTextView);
-
-        //Set empty state image width and height
-        emptyStateImageView.getLayoutParams().width = emptyStateImageWidth;
-        emptyStateImageView.getLayoutParams().height = emptyStateImageHeight;
-        emptyStateImageView.requestLayout();
-
-        emptyStateTitleTextView.setTextSize(emptyStateTitleTextSize);
-        emptyStateContentTextView.setTextSize(emptyStateContentTextSize);
-        emptyStateTitleTextView.setTextColor(emptyStateTitleTextColor);
-        emptyStateContentTextView.setTextColor(emptyStateContentTextColor);
-
-        //Set background color if not TRANSPARENT
-        if (emptyStateBackgroundColor != Color.TRANSPARENT) {
-            emptyStateRelativeLayout.setBackgroundColor(emptyStateBackgroundColor);
-        }
+        if (emptyStateRelativeLayout == null) {
+            view = inflater.inflate(R.layout.progress_empty_view, null);
+            emptyStateRelativeLayout = (RelativeLayout) view.findViewById(R.id.emptyStateRelativeLayout);
+            emptyStateRelativeLayout.setTag(TAG_EMPTY);
+
+            emptyStateImageView = (ImageView) view.findViewById(R.id.emptyStateImageView);
+            emptyStateTitleTextView = (TextView) view.findViewById(R.id.emptyStateTitleTextView);
+            emptyStateContentTextView = (TextView) view.findViewById(R.id.emptyStateContentTextView);
+
+            //Set empty state image width and height
+            emptyStateImageView.getLayoutParams().width = emptyStateImageWidth;
+            emptyStateImageView.getLayoutParams().height = emptyStateImageHeight;
+            emptyStateImageView.requestLayout();
+
+            emptyStateTitleTextView.setTextSize(emptyStateTitleTextSize);
+            emptyStateContentTextView.setTextSize(emptyStateContentTextSize);
+            emptyStateTitleTextView.setTextColor(emptyStateTitleTextColor);
+            emptyStateContentTextView.setTextColor(emptyStateContentTextColor);
+
+            //Set background color if not TRANSPARENT
+            if (emptyStateBackgroundColor != Color.TRANSPARENT) {
+                emptyStateRelativeLayout.setBackgroundColor(emptyStateBackgroundColor);
+            }
 
-        layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT);
-        layoutParams.addRule(CENTER_IN_PARENT);
+            layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT);
+            layoutParams.addRule(CENTER_IN_PARENT);
 
-        addView(emptyStateRelativeLayout, layoutParams);
+            addView(emptyStateRelativeLayout, layoutParams);
+        } else  {
+            emptyStateRelativeLayout.setVisibility(VISIBLE);
+        }
     }
 
     private void setErrorView() {
-        view = inflater.inflate(R.layout.progress_error_view, null);
-        errorStateRelativeLayout = (RelativeLayout) view.findViewById(R.id.errorStateRelativeLayout);
-        errorStateRelativeLayout.setTag(TAG_ERROR);
-
-        errorStateImageView = (ImageView) view.findViewById(R.id.errorStateImageView);
-        errorStateTitleTextView = (TextView) view.findViewById(R.id.errorStateTitleTextView);
-        errorStateContentTextView = (TextView) view.findViewById(R.id.errorStateContentTextView);
-        errorStateButton = (Button) view.findViewById(R.id.errorStateButton);
-
-        //Set error state image width and height
-        errorStateImageView.getLayoutParams().width = errorStateImageWidth;
-        errorStateImageView.getLayoutParams().height = errorStateImageHeight;
-        errorStateImageView.requestLayout();
-
-        errorStateTitleTextView.setTextSize(errorStateTitleTextSize);
-        errorStateContentTextView.setTextSize(errorStateContentTextSize);
-        errorStateTitleTextView.setTextColor(errorStateTitleTextColor);
-        errorStateContentTextView.setTextColor(errorStateContentTextColor);
-        errorStateButton.setTextColor(errorStateButtonTextColor);
-
-        //Set background color if not TRANSPARENT
-        if (errorStateBackgroundColor != Color.TRANSPARENT) {
-            errorStateRelativeLayout.setBackgroundColor(errorStateBackgroundColor);
-        }
+        if (errorStateRelativeLayout == null) {
+            view = inflater.inflate(R.layout.progress_error_view, null);
+            errorStateRelativeLayout = (RelativeLayout) view.findViewById(R.id.errorStateRelativeLayout);
+            errorStateRelativeLayout.setTag(TAG_ERROR);
+
+            errorStateImageView = (ImageView) view.findViewById(R.id.errorStateImageView);
+            errorStateTitleTextView = (TextView) view.findViewById(R.id.errorStateTitleTextView);
+            errorStateContentTextView = (TextView) view.findViewById(R.id.errorStateContentTextView);
+            errorStateButton = (Button) view.findViewById(R.id.errorStateButton);
+
+            //Set error state image width and height
+            errorStateImageView.getLayoutParams().width = errorStateImageWidth;
+            errorStateImageView.getLayoutParams().height = errorStateImageHeight;
+            errorStateImageView.requestLayout();
+
+            errorStateTitleTextView.setTextSize(errorStateTitleTextSize);
+            errorStateContentTextView.setTextSize(errorStateContentTextSize);
+            errorStateTitleTextView.setTextColor(errorStateTitleTextColor);
+            errorStateContentTextView.setTextColor(errorStateContentTextColor);
+            errorStateButton.setTextColor(errorStateButtonTextColor);
+
+            //Set background color if not TRANSPARENT
+            if (errorStateBackgroundColor != Color.TRANSPARENT) {
+                errorStateRelativeLayout.setBackgroundColor(errorStateBackgroundColor);
+            }
 
-        layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT);
-        layoutParams.addRule(CENTER_IN_PARENT);
+            layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT);
+            layoutParams.addRule(CENTER_IN_PARENT);
 
-        addView(errorStateRelativeLayout, layoutParams);
+            addView(errorStateRelativeLayout, layoutParams);
+        } else {
+            errorStateRelativeLayout.setVisibility(VISIBLE);
+        }
     }
 
     private void setContentVisibility(boolean visible, List<Integer> skipIds) {
@@ -442,8 +459,4 @@ private void hideErrorView() {
             errorStateRelativeLayout.setVisibility(GONE);
         }
     }
-
-    public static enum State {
-        CONTENT, LOADING, EMPTY, ERROR
-    }
 }
\ No newline at end of file
diff --git a/library/src/main/res/layout/progress_empty_view.xml b/library/src/main/res/layout/progress_empty_view.xml
index b3e55d4..d8d1f50 100644
--- a/library/src/main/res/layout/progress_empty_view.xml
+++ b/library/src/main/res/layout/progress_empty_view.xml
@@ -5,18 +5,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/emptyViewRelativeLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:orientation="vertical"
         tools:ignore="UselessParent">
 
         <ImageView
             android:id="@+id/emptyStateImageView"
             android:layout_width="108dp"
             android:layout_height="108dp"
-            android:layout_centerHorizontal="true"
+            android:layout_gravity="center_horizontal"
             tools:background="#000000"
             tools:ignore="ContentDescription" />
 
@@ -24,8 +25,7 @@
             android:id="@+id/emptyStateTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/emptyStateImageView"
-            android:layout_centerHorizontal="true"
+            android:layout_gravity="center_horizontal"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginTop="20dp"
@@ -37,8 +37,7 @@
             android:id="@+id/emptyStateContentTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/emptyStateTitleTextView"
-            android:layout_centerHorizontal="true"
+            android:layout_gravity="center_horizontal"
             android:layout_marginBottom="16dp"
             android:layout_marginLeft="56dp"
             android:layout_marginRight="56dp"
@@ -47,6 +46,6 @@
             android:lineSpacingExtra="5.5dp"
             tools:text="@string/progressActivityEmptyContentPlaceholder" />
 
-    </RelativeLayout>
+    </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/progress_error_view.xml b/library/src/main/res/layout/progress_error_view.xml
index 20cb5e6..f762490 100644
--- a/library/src/main/res/layout/progress_error_view.xml
+++ b/library/src/main/res/layout/progress_error_view.xml
@@ -5,18 +5,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/errorViewRelativeLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        tools:ignore="UselessParent">
+        android:orientation="vertical">
 
         <ImageView
             android:id="@+id/errorStateImageView"
             android:layout_width="108dp"
             android:layout_height="108dp"
-            android:layout_centerHorizontal="true"
+            android:layout_gravity="center_horizontal"
             tools:background="#000000"
             tools:ignore="ContentDescription" />
 
@@ -24,8 +24,7 @@
             android:id="@+id/errorStateTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/errorStateImageView"
-            android:layout_centerHorizontal="true"
+            android:layout_gravity="center_horizontal"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginTop="20dp"
@@ -37,8 +36,7 @@
             android:id="@+id/errorStateContentTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/errorStateTitleTextView"
-            android:layout_centerHorizontal="true"
+            android:layout_gravity="center_horizontal"
             android:layout_marginBottom="16dp"
             android:layout_marginLeft="56dp"
             android:layout_marginRight="56dp"
@@ -51,10 +49,9 @@
             android:id="@+id/errorStateButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/errorStateContentTextView"
-            android:layout_centerHorizontal="true"
+            android:layout_gravity="center_horizontal"
             android:text="@string/progressActivityErrorButton"/>
 
-    </RelativeLayout>
+    </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/sample/build.gradle b/sample/build.gradle
index 9785409..0e7d64c 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "com.vlonjatg.sample.progressactivity"
         minSdkVersion 8
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
@@ -21,7 +21,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:appcompat-v7:23.0.1'
     compile project (path: ':library')
     compile 'com.malinskiy:materialicons:1.0.2'
 }
diff --git a/sample/sample.iml b/sample/sample.iml
index b72b4dd..60ce107 100644
--- a/sample/sample.iml
+++ b/sample/sample.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":sample" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ProgressActivity" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":sample" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="progress-activity" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -85,14 +85,16 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="materialicons-1.0.2" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
     <orderEntry type="module" module-name="library" exported="" />
   </component>
 </module>
\ No newline at end of file