diff --git a/app/src/main/res/layout/app_more_inc.xml b/app/src/main/res/layout/app_more_inc.xml
index 4611f29be..a9afacb8f 100644
--- a/app/src/main/res/layout/app_more_inc.xml
+++ b/app/src/main/res/layout/app_more_inc.xml
@@ -13,44 +13,45 @@
         android:layout_margin="5dp"
         android:visibility="gone"
         app:cardCornerRadius="2dp"
-        app:cardElevation="2dp">
+        app:cardElevation="2dp"
+        app:contentPadding="5dp">
 
         <TextView
             android:id="@+id/description_header"
-            android:text="@string/details_description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="5dp"
+            android:layout_marginStart="10dp"
             android:drawableEnd="@drawable/ic_expand_more"
-            android:visibility="gone"
             android:gravity="center|start"
-            android:textSize="14sp"
+            android:text="@string/details_description"
             android:textAllCaps="true"
-            android:textStyle="bold"/>
+            android:textSize="14sp"
+            android:textStyle="bold"
+            android:visibility="gone" />
 
         <LinearLayout
             android:id="@+id/description_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
             android:layout_marginTop="32dp"
+            android:orientation="vertical"
             android:visibility="gone">
 
             <TextView
                 android:id="@+id/description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:autoLink="web|email"
                 android:layout_margin="10dp"
-                android:paddingTop="6dip"/>
+                android:autoLink="web|email"
+                android:paddingTop="6dip" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
-                android:background="@color/changelog_bg">
+                android:layout_marginTop="10dp"
+                android:background="@color/changelog_bg"
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/changes_title"
@@ -59,30 +60,30 @@
                     android:layout_margin="10dp"
                     android:text="@string/details_changelog"
                     android:textAllCaps="true"
+                    android:textColor="@color/changelog_txt"
                     android:textSize="14sp"
                     android:textStyle="bold"
-                    android:textColor="@color/changelog_txt"
-                    android:visibility="gone"  />
+                    android:visibility="gone" />
 
                 <TextView
                     android:id="@+id/changes"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:autoLink="web|email"
                     android:layout_margin="10dp"
-                    android:textIsSelectable="true"
-                    android:visibility="gone"
+                    android:autoLink="web|email"
+                    android:lineSpacingExtra="5dp"
                     android:textColor="@color/changelog_txt"
-                    android:lineSpacingExtra="5dp"/>
+                    android:textIsSelectable="true"
+                    android:visibility="gone" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/offer_details"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_margin="10dp"/>
+                android:layout_margin="10dp"
+                android:orientation="vertical" />
 
-    </LinearLayout>
+        </LinearLayout>
     </android.support.v7.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_perm_inc.xml b/app/src/main/res/layout/app_perm_inc.xml
index 83591bf53..d3a645d7b 100644
--- a/app/src/main/res/layout/app_perm_inc.xml
+++ b/app/src/main/res/layout/app_perm_inc.xml
@@ -18,6 +18,7 @@
             android:id="@+id/permissions_header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
             android:drawableEnd="@drawable/ic_expand_more"
             android:gravity="center|start"
             android:text="@string/details_permissions"
diff --git a/app/src/main/res/layout/app_reviews_inc.xml b/app/src/main/res/layout/app_reviews_inc.xml
index 2c2a84e42..be9ed932c 100644
--- a/app/src/main/res/layout/app_reviews_inc.xml
+++ b/app/src/main/res/layout/app_reviews_inc.xml
@@ -19,6 +19,7 @@
             android:id="@+id/reviews_header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
             android:drawableEnd="@drawable/ic_expand_more"
             android:text="@string/details_reviews"
             android:visibility="gone"
diff --git a/app/src/main/res/layout/details_activity_layout.xml b/app/src/main/res/layout/details_activity_layout.xml
index 4acbdb429..c79ca31d5 100644
--- a/app/src/main/res/layout/details_activity_layout.xml
+++ b/app/src/main/res/layout/details_activity_layout.xml
@@ -5,25 +5,35 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context="in.dragons.galaxy.AboutActivity"
     tools:openDrawer="start">
 
-    <LinearLayout
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/main_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:fitsSystemWindows="true">
 
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
+        <android.support.design.widget.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
-            android:theme="@style/MyToolbarStyle" />
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <ScrollView
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/colorPrimary"
+                android:theme="@style/MyToolbarStyle"
+                app:layout_scrollFlags="scroll|enterAlways" />
+        </android.support.design.widget.AppBarLayout>
+
+        <android.support.v4.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scrollbars="none">
+            android:scrollbars="none"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -67,7 +77,7 @@
                         android:id="@+id/icon"
                         android:layout_width="@dimen/icon_size"
                         android:layout_height="@dimen/icon_size"
-                        android:layout_marginRight="6dp"
+                        android:layout_marginEnd="6dp"
                         android:background="@null"
                         android:contentDescription="@string/content_description_app_icon"
                         android:scaleType="fitXY"
@@ -112,9 +122,9 @@
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
                     android:layout_marginTop="10dp"
-                    android:weightSum="3"
                     android:gravity="end"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:weightSum="3">
 
                     <android.support.v7.widget.AppCompatButton
                         android:id="@+id/uninstall"
@@ -123,7 +133,7 @@
                         android:layout_weight="1"
                         android:background="@drawable/button_bg_outine"
                         android:maxLines="1"
-                        android:text="Uninstall"
+                        android:text="@string/details_uninstall"
                         android:textColor="@color/button_bg"
                         android:theme="@style/Widget.AppCompat.Button.Borderless.Colored"
                         android:visibility="gone" />
@@ -199,7 +209,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/download_progress"
-                    android:layout_marginRight="15dp"
+                    android:layout_marginEnd="15dp"
                     android:gravity="end" />
 
                 <View
@@ -228,7 +238,6 @@
                         android:id="@+id/divider_bottom"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-                        android:layout_below="@id/main_action"
                         android:layout_marginBottom="5dp"
                         android:layout_marginLeft="15dp"
                         android:layout_marginRight="15dp"
@@ -260,7 +269,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:visibility="visible"></LinearLayout>
+                        android:visibility="visible"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -306,8 +315,6 @@
                         android:id="@+id/progress"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:layout_centerVertical="true"
                         android:layout_gravity="center"
                         android:layout_marginTop="10dp"
                         android:indeterminate="true"
@@ -316,8 +323,8 @@
 
                 </LinearLayout>
             </RelativeLayout>
-        </ScrollView>
-    </LinearLayout>
+        </android.support.v4.widget.NestedScrollView>
+    </android.support.design.widget.CoordinatorLayout>
 
     <android.support.design.widget.NavigationView
         android:id="@+id/nav_view"