diff --git a/app/src/main/res/drawable/bg_circular_top_corners.xml b/app/src/main/res/drawable/bg_circular_top_corners.xml
index ba57cb30..299df828 100644
--- a/app/src/main/res/drawable/bg_circular_top_corners.xml
+++ b/app/src/main/res/drawable/bg_circular_top_corners.xml
@@ -4,8 +4,5 @@
   <corners
     android:topLeftRadius="12dp"
     android:topRightRadius="12dp"/>
-  <padding
-    android:bottom="8dp"
-    android:top="8dp"/>
   <solid android:color="?attr/cardBackgroundColor"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_settings.xml b/app/src/main/res/layout-land/activity_settings.xml
index 9928c11a..5c671f60 100644
--- a/app/src/main/res/layout-land/activity_settings.xml
+++ b/app/src/main/res/layout-land/activity_settings.xml
@@ -1,67 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <android.support.design.widget.AppBarLayout
+    android:id="@+id/app_bar"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
-    <android.support.design.widget.AppBarLayout
-        android:id="@+id/app_bar"
+    <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
+      android:layout_width="match_parent"
+      android:layout_height="96dp"
+      app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
+      app:expandedTitleGravity="top"
+      app:expandedTitleMarginStart="16dp"
+      app:expandedTitleMarginTop="48dp"
+      app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
+      app:layout_scrollFlags="scroll|exitUntilCollapsed"
+      app:title="@string/action_settings">
+
+      <View
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"/>
 
-        <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
-            android:layout_width="match_parent"
-            android:layout_height="96dp"
-            app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
-            app:expandedTitleGravity="top"
-            app:expandedTitleMarginStart="16dp"
-            app:expandedTitleMarginTop="48dp"
-            app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:title="@string/action_settings">
+      <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/Toolbar48"
+        app:layout_collapseMode="pin"
+        app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+        app:title="@string/support_development"/>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+    </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
+  </android.support.design.widget.AppBarLayout>
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                style="@style/Toolbar48"
-                android:title="@string/action_settings"
-                app:layout_collapseMode="pin"
-                app:navigationIcon="@drawable/ic_close_white_24dp"
-                app:title="@string/action_settings">
+  <LinearLayout
+    android:id="@+id/background"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                <android.support.design.widget.TabLayout
-                    android:id="@+id/tabs"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dp"
-                    android:layout_gravity="end"
-                    app:tabGravity="center"
-                    app:tabMode="scrollable"
-                    app:tabTextAppearance="@style/SettingsTabsTextAppearance" />
+    <FrameLayout
+      android:id="@+id/content_frame"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
 
-            </android.support.v7.widget.Toolbar>
-        </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <FrameLayout
-            android:id="@+id/content_frame"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <FrameLayout
-            android:id="@+id/detail_content_frame"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-    </LinearLayout>
+    <FrameLayout
+      android:id="@+id/detail_content_frame"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+  </LinearLayout>
 </android.support.design.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
new file mode 100644
index 00000000..afb53ac3
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <FrameLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:ignore="UnusedAttribute">
+
+    <include layout="@layout/status_bar"/>
+
+  </FrameLayout>
+
+  <android.support.design.widget.CoordinatorLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.design.widget.AppBarLayout
+      android:id="@+id/appbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:focusable="true"
+      tools:ignore="UnusedAttribute">
+
+      <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
+        android:id="@+id/collapsing_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="96dp"
+        app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
+        app:expandedTitleGravity="top"
+        app:expandedTitleMarginStart="16dp"
+        app:expandedTitleMarginTop="48dp"
+        app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
+        app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="48dp"
+          app:layout_collapseMode="parallax"
+          app:layout_collapseParallaxMultiplier="0.7"/>
+
+        <android.support.v7.widget.Toolbar
+          android:id="@+id/home_toolbar"
+          style="@style/Toolbar"
+          tools:ignore="UnusedAttribute">
+
+          <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <code.name.monkey.retromusic.views.IconImageView
+              android:id="@+id/search"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_weight="0"
+              android:padding="16dp"
+              android:src="@drawable/ic_search_white_24dp"/>
+
+            <TextView
+              android:id="@+id/title"
+              fontPath="@string/circular_std_black"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:gravity="center"
+              android:text="@string/app_name"
+              android:textAppearance="@style/TextAppearance.AppCompat.Title"
+              android:textColor="?android:attr/textColorPrimary"
+              tools:ignore="MissingPrefix"/>
+
+            <code.name.monkey.retromusic.views.CircularImageView
+              android:id="@+id/user_image"
+              android:layout_width="36dp"
+              android:layout_height="36dp"
+              android:layout_weight="0"
+              android:layout_marginEnd="16dp"
+              app:civ_border="false"/>
+          </LinearLayout>
+        </android.support.v7.widget.Toolbar>
+      </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.widget.NestedScrollView
+      android:id="@+id/nested_scroll"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="60dp"
+      android:layout_marginEnd="60dp"
+      app:behavior_overlapTop="24dp"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+      <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_bottom_sheet_dialog_fragment"
+        android:descendantFocusability="blocksDescendants"
+        android:elevation="@dimen/card_elevation"
+        android:layout_margin="4dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <include layout="@layout/abs_playlists"/>
+
+        <include layout="@layout/home_section_content"/>
+      </LinearLayout>
+    </android.support.v4.widget.NestedScrollView>
+  </android.support.design.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/activity_about_content.xml b/app/src/main/res/layout-sw600dp/activity_about_content.xml
index ca969b80..e6cf1859 100644
--- a/app/src/main/res/layout-sw600dp/activity_about_content.xml
+++ b/app/src/main/res/layout-sw600dp/activity_about_content.xml
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:grid="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
+  xmlns:grid="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:padding="8dp"
+  grid:alignmentMode="alignBounds">
+
+  <LinearLayout
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:padding="8dp"
-    grid:alignmentMode="alignBounds">
+    android:layout_marginEnd="4dp"
+    android:orientation="vertical"
+    grid:layout_column="0"
+    grid:layout_columnWeight="1"
+    grid:layout_row="0">
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="4dp"
-        android:orientation="vertical"
-        grid:layout_column="0"
-        grid:layout_columnWeight="1"
-        grid:layout_row="0">
+    <include layout="@layout/card_retro_info"/>
 
-        <include layout="@layout/card_retro_info" />
+    <include layout="@layout/card_credit"/>
+  </LinearLayout>
 
-        <include layout="@layout/card_donate" />
+  <LinearLayout
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="4dp"
+    android:orientation="vertical"
+    grid:layout_column="1"
+    grid:layout_columnWeight="1"
+    grid:layout_row="0">
 
-        <include layout="@layout/card_credit" />
-    </LinearLayout>
+    <include layout="@layout/card_social"/>
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:orientation="vertical"
-        grid:layout_column="1"
-        grid:layout_columnWeight="1"
-        grid:layout_row="0">
+    <include layout="@layout/card_other"/>
 
-        <include layout="@layout/card_social" />
-
-        <include layout="@layout/card_other" />
-
-    </LinearLayout>
+  </LinearLayout>
 </android.support.v7.widget.GridLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
new file mode 100644
index 00000000..6bf6f946
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <FrameLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:ignore="UnusedAttribute">
+
+    <include layout="@layout/status_bar"/>
+
+  </FrameLayout>
+
+  <android.support.design.widget.CoordinatorLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.design.widget.AppBarLayout
+      android:id="@+id/appbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:focusable="true"
+      tools:ignore="UnusedAttribute">
+
+      <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
+        android:id="@+id/collapsing_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="96dp"
+        app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
+        app:expandedTitleGravity="top"
+        app:expandedTitleMarginStart="16dp"
+        app:expandedTitleMarginTop="48dp"
+        app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
+        app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="48dp"
+          app:layout_collapseMode="parallax"
+          app:layout_collapseParallaxMultiplier="0.7"/>
+
+        <android.support.v7.widget.Toolbar
+          android:id="@+id/home_toolbar"
+          style="@style/Toolbar"
+          tools:ignore="UnusedAttribute">
+
+          <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <code.name.monkey.retromusic.views.IconImageView
+              android:id="@+id/search"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_weight="0"
+              android:padding="16dp"
+              android:src="@drawable/ic_search_white_24dp"/>
+
+            <TextView
+              android:id="@+id/title"
+              fontPath="@string/circular_std_black"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:gravity="center"
+              android:text="@string/app_name"
+              android:textAppearance="@style/TextAppearance.AppCompat.Title"
+              android:textColor="?android:attr/textColorPrimary"
+              tools:ignore="MissingPrefix"/>
+
+            <code.name.monkey.retromusic.views.CircularImageView
+              android:id="@+id/user_image"
+              android:layout_width="36dp"
+              android:layout_height="36dp"
+              android:layout_weight="0"
+              android:layout_marginEnd="16dp"
+              app:civ_border="false"/>
+          </LinearLayout>
+        </android.support.v7.widget.Toolbar>
+      </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.widget.NestedScrollView
+      android:id="@+id/nested_scroll"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="128dp"
+      android:layout_marginEnd="128dp"
+      app:behavior_overlapTop="24dp"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+      <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="4dp"
+        android:background="@drawable/bg_bottom_sheet_dialog_fragment"
+        android:descendantFocusability="blocksDescendants"
+        android:elevation="@dimen/card_elevation"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <include layout="@layout/abs_playlists"/>
+
+        <include layout="@layout/home_section_content"/>
+      </LinearLayout>
+    </android.support.v4.widget.NestedScrollView>
+  </android.support.design.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_library.xml b/app/src/main/res/layout-xlarge/fragment_library.xml
index face7ece..4b1c039d 100644
--- a/app/src/main/res/layout-xlarge/fragment_library.xml
+++ b/app/src/main/res/layout-xlarge/fragment_library.xml
@@ -1,73 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <FrameLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:elevation="0dp"
+    tools:ignore="UnusedAttribute">
+
+    <include layout="@layout/status_bar"/>
+
+  </FrameLayout>
+
+  <android.support.design.widget.CoordinatorLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.design.widget.AppBarLayout
+      android:id="@+id/appbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?colorPrimary"
+      tools:ignore="UnusedAttribute">
+
+      <android.support.design.widget.CollapsingToolbarLayout
+        android:id="@+id/collapsing_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="62dp"
+        app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
+        app:titleEnabled="false">
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="48dp"
+          app:layout_collapseMode="parallax"
+          app:layout_collapseParallaxMultiplier="0.7"/>
+
+        <android.support.v7.widget.Toolbar
+          android:id="@+id/toolbar"
+          style="@style/Toolbar48"
+          android:background="?colorPrimary"
+          tools:ignore="UnusedAttribute"/>
+
+
+      </android.support.design.widget.CollapsingToolbarLayout>
+
+      <ViewStub
+        android:id="@+id/cab_stub"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        app:layout_collapseMode="parallax"
+        app:layout_collapseParallaxMultiplier="0.7"/>
+    </android.support.design.widget.AppBarLayout>
+
 
     <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        tools:ignore="UnusedAttribute">
+      android:id="@+id/fragment_container"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-        <include layout="@layout/status_bar" />
-
-    </FrameLayout>
-
-    <android.support.design.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?colorPrimary"
-            tools:ignore="UnusedAttribute">
-
-            <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="128dp"
-                app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
-                app:expandedTitleGravity="top"
-                app:expandedTitleMarginStart="24dp"
-                app:expandedTitleMarginTop="64dp"
-                app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    app:layout_collapseMode="parallax"
-                    app:layout_collapseParallaxMultiplier="0.7" />
-
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
-                    android:background="?colorPrimary"
-                    tools:ignore="UnusedAttribute" />
-
-
-            </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-
-            <ViewStub
-                android:id="@+id/cab_stub"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                app:layout_collapseMode="parallax"
-                app:layout_collapseParallaxMultiplier="0.7" />
-        </android.support.design.widget.AppBarLayout>
-
-
-        <FrameLayout
-            android:id="@+id/fragment_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </android.support.design.widget.CoordinatorLayout>
+  </android.support.design.widget.CoordinatorLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index dc611f6f..e62ea1ca 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,56 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/root"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/root"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <android.support.design.widget.AppBarLayout
+    android:id="@+id/app_bar"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
-    <android.support.design.widget.AppBarLayout
-        android:id="@+id/app_bar"
+    <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
+      android:layout_width="match_parent"
+      android:layout_height="96dp"
+      app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
+      app:expandedTitleGravity="top"
+      app:expandedTitleMarginStart="16dp"
+      app:expandedTitleMarginTop="48dp"
+      app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
+      app:layout_scrollFlags="scroll|exitUntilCollapsed"
+      app:title="@string/action_about">
+
+      <View
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"/>
 
-        <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
-            android:layout_width="match_parent"
-            android:layout_height="96dp"
-            app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
-            app:expandedTitleGravity="top"
-            app:expandedTitleMarginStart="16dp"
-            app:expandedTitleMarginTop="48dp"
-            app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:title="@string/action_about">
+      <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/Toolbar48"
+        app:layout_collapseMode="pin"
+        app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+        app:title="@string/support_development"/>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+    </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
+  </android.support.design.widget.AppBarLayout>
+  <android.support.v4.widget.NestedScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                style="@style/Toolbar48"
-                android:background="?colorPrimary"
-                app:layout_collapseMode="pin"
-                app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
-                app:title="@string/action_about" />
-
-        </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v4.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:isScrollContainer="true"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-
-            <include layout="@layout/activity_about_content" />
-        </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
+    <include layout="@layout/activity_about_content"/>
 
+  </android.support.v4.widget.NestedScrollView>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about_content.xml b/app/src/main/res/layout/activity_about_content.xml
index 13ba791d..408b8b6c 100644
--- a/app/src/main/res/layout/activity_about_content.xml
+++ b/app/src/main/res/layout/activity_about_content.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="8dp">
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:padding="8dp"
+  android:orientation="vertical">
 
-    <include layout="@layout/card_retro_info" />
+  <include layout="@layout/card_retro_info"/>
 
-    <include layout="@layout/card_donate" />
+  <include layout="@layout/card_social"/>
 
-    <include layout="@layout/card_social" />
+  <include layout="@layout/card_other"/>
 
-    <include layout="@layout/card_other" />
-
-    <include layout="@layout/card_credit" />
+  <include layout="@layout/card_credit"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1e2496f0..fcb7bd50 100755
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -27,28 +27,19 @@
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
-                android:title="@string/action_settings"
                 app:layout_collapseMode="pin"
                 app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
-                app:title="@string/action_settings">
+                app:title="@string/support_development" />
 
-                <android.support.design.widget.TabLayout
-                    android:id="@+id/tabs"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dp"
-                    android:layout_gravity="end"
-                    app:tabGravity="center"
-                    app:tabMode="scrollable"
-                    app:tabTextAppearance="@style/SettingsTabsTextAppearance" />
-
-            </android.support.v7.widget.Toolbar>
         </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
     </android.support.design.widget.AppBarLayout>
 
+
     <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
 </android.support.design.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/card_donate.xml b/app/src/main/res/layout/card_donate.xml
index ac7f61eb..22a582dd 100644
--- a/app/src/main/res/layout/card_donate.xml
+++ b/app/src/main/res/layout/card_donate.xml
@@ -27,36 +27,7 @@
             tools:ignore="MissingPrefix" />
 
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingEnd="16dp"
-            android:paddingStart="16dp">
 
-            <android.support.v7.widget.CardView
-                android:id="@+id/support_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/social_buttons"
-                android:foreground="?rectSelector"
-                app:cardCornerRadius="24dp"
-                app:cardElevation="6dp"
-                app:cardPreventCornerOverlap="false"
-                app:cardUseCompatPadding="true">
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:background="@drawable/gradient_1"
-                    android:gravity="center"
-                    android:padding="16dp"
-                    android:text="@string/donate"
-                    android:textColor="@color/md_white_1000" />
-            </android.support.v7.widget.CardView>
-
-        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_retro_info.xml b/app/src/main/res/layout/card_retro_info.xml
index 86f45445..7ab6ffbb 100644
--- a/app/src/main/res/layout/card_retro_info.xml
+++ b/app/src/main/res/layout/card_retro_info.xml
@@ -1,248 +1,294 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  app:cardCornerRadius="12dp"
+  app:cardElevation="8dp"
+  app:cardPreventCornerOverlap="false"
+  app:cardUseCompatPadding="true">
+
+  <LinearLayout
+    android:id="@+id/app_support"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardCornerRadius="12dp"
-    app:cardElevation="8dp"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true">
+    android:padding="8dp"
+    android:background="@drawable/gradient_6"
+    android:orientation="vertical">
+
+    <TextView
+      fontPath="@string/circular_std_black"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:padding="12dp"
+      android:text="@string/support_development"
+      android:textAppearance="@style/TextAppearance.AppCompat.Title"
+      android:textColor="@color/md_white_1000"
+      tools:ignore="MissingPrefix"/>
 
     <LinearLayout
-        android:id="@+id/app_support"
+      android:id="@+id/app_github"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?attr/rectSelector"
+      android:clickable="true"
+      android:focusable="true"
+      android:gravity="center_vertical"
+      android:minHeight="@dimen/md_listitem_height"
+      android:orientation="horizontal"
+      tools:ignore="PrivateResource">
+
+      <android.support.v7.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:contentDescription="@string/social_buttons"
+        app:srcCompat="@drawable/ic_github_circle_white_24dp"
+        app:tint="@color/md_white_1000"/>
+
+      <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/gradient_6"
-        android:orientation="vertical"
-        android:padding="8dp">
-
-        <TextView
-            fontPath="@string/circular_std_black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:text="@string/app_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="@color/md_white_1000"
-            tools:ignore="MissingPrefix" />
-
-        <LinearLayout
-            android:id="@+id/app_github"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/rectSelector"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center_vertical"
-            android:minHeight="@dimen/md_listitem_height"
-            android:orientation="horizontal"
-            tools:ignore="PrivateResource">
-
-            <android.support.v7.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/social_buttons"
-                android:padding="16dp"
-                app:srcCompat="@drawable/ic_github_circle_white_24dp"
-                app:tint="@color/md_white_1000" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp">
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:orientation="vertical">
 
 
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/git_hub"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="@color/md_white_1000" />
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/git_hub"
+          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+          android:textColor="@color/md_white_1000"/>
 
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.85"
-                    android:text="@string/git_hub_summary"
-                    android:textColor="@color/md_white_1000" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/app_translation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/rectSelector"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center_vertical"
-            android:minHeight="@dimen/md_listitem_height"
-            android:orientation="horizontal"
-            tools:ignore="PrivateResource">
-
-            <android.support.v7.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/social_buttons"
-                android:padding="16dp"
-                app:srcCompat="@drawable/ic_flag_white_24dp"
-                app:tint="@color/md_white_1000" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp">
-
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/translate"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="@color/md_white_1000" />
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.85"
-                    android:text="@string/translate_community"
-                    android:textColor="@color/md_white_1000" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/app_rate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/rectSelector"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center_vertical"
-            android:minHeight="@dimen/md_listitem_height"
-            android:orientation="horizontal"
-            tools:ignore="PrivateResource">
-
-            <android.support.v7.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/social_buttons"
-                android:padding="16dp"
-                app:srcCompat="@drawable/ic_star_white_24dp"
-                app:tint="@color/md_white_1000" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp">
-
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/rate_app"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="@color/md_white_1000" />
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.85"
-                    android:text="@string/rate_on_google_play_summary"
-                    android:textColor="@color/md_white_1000" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/app_share"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/rectSelector"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center_vertical"
-            android:minHeight="@dimen/md_listitem_height"
-            android:orientation="horizontal"
-            tools:ignore="PrivateResource">
-
-            <android.support.v7.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/social_buttons"
-                android:padding="16dp"
-                app:srcCompat="@drawable/ic_share_white_24dp"
-                app:tint="@color/md_white_1000" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp">
-
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/action_share"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="@color/md_white_1000" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/faq_link"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/rectSelector"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center_vertical"
-            android:minHeight="@dimen/md_listitem_height"
-            android:orientation="horizontal"
-            tools:ignore="PrivateResource">
-
-            <android.support.v7.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/social_buttons"
-                android:padding="16dp"
-                app:srcCompat="@drawable/ic_help_white_24dp"
-                app:tint="@color/md_white_1000" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp">
-
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/faq"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="@color/md_white_1000" />
-
-            </LinearLayout>
-        </LinearLayout>
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:alpha="0.85"
+          android:text="@string/git_hub_summary"
+          android:textColor="@color/md_white_1000"/>
+      </LinearLayout>
     </LinearLayout>
+
+    <LinearLayout
+      android:id="@+id/app_translation"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?attr/rectSelector"
+      android:clickable="true"
+      android:focusable="true"
+      android:gravity="center_vertical"
+      android:minHeight="@dimen/md_listitem_height"
+      android:orientation="horizontal"
+      tools:ignore="PrivateResource">
+
+      <android.support.v7.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:contentDescription="@string/social_buttons"
+        app:srcCompat="@drawable/ic_flag_white_24dp"
+        app:tint="@color/md_white_1000"/>
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:orientation="vertical">
+
+
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/translate"
+          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+          android:textColor="@color/md_white_1000"/>
+
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:alpha="0.85"
+          android:text="@string/translate_community"
+          android:textColor="@color/md_white_1000"/>
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+      android:id="@+id/app_rate"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?attr/rectSelector"
+      android:clickable="true"
+      android:focusable="true"
+      android:gravity="center_vertical"
+      android:minHeight="@dimen/md_listitem_height"
+      android:orientation="horizontal"
+      tools:ignore="PrivateResource">
+
+      <android.support.v7.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:contentDescription="@string/social_buttons"
+        app:srcCompat="@drawable/ic_star_white_24dp"
+        app:tint="@color/md_white_1000"/>
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:orientation="vertical">
+
+
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/rate_app"
+          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+          android:textColor="@color/md_white_1000"/>
+
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:alpha="0.85"
+          android:text="@string/rate_on_google_play_summary"
+          android:textColor="@color/md_white_1000"/>
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+      android:id="@+id/donate_link"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?attr/rectSelector"
+      android:clickable="true"
+      android:focusable="true"
+      android:gravity="center_vertical"
+      android:minHeight="@dimen/md_listitem_height"
+      android:orientation="horizontal"
+      tools:ignore="PrivateResource">
+
+      <android.support.v7.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:contentDescription="@string/social_buttons"
+        app:srcCompat="@drawable/ic_card_giftcard_white_24dp"
+        app:tint="@color/md_white_1000"/>
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:orientation="vertical">
+
+
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/donate"
+          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+          android:textColor="@color/md_white_1000"/>
+
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:alpha="0.85"
+          android:text="@string/donate_summary"
+          android:textColor="@color/md_white_1000"/>
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+      android:id="@+id/app_share"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?attr/rectSelector"
+      android:clickable="true"
+      android:focusable="true"
+      android:gravity="center_vertical"
+      android:minHeight="@dimen/md_listitem_height"
+      android:orientation="horizontal"
+      tools:ignore="PrivateResource">
+
+      <android.support.v7.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:contentDescription="@string/social_buttons"
+        app:srcCompat="@drawable/ic_share_white_24dp"
+        app:tint="@color/md_white_1000"/>
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:orientation="vertical">
+
+
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/action_share"
+          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+          android:textColor="@color/md_white_1000"/>
+
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+      android:id="@+id/faq_link"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?attr/rectSelector"
+      android:clickable="true"
+      android:focusable="true"
+      android:gravity="center_vertical"
+      android:minHeight="@dimen/md_listitem_height"
+      android:orientation="horizontal"
+      tools:ignore="PrivateResource">
+
+      <android.support.v7.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:contentDescription="@string/social_buttons"
+        app:srcCompat="@drawable/ic_help_white_24dp"
+        app:tint="@color/md_white_1000"/>
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:orientation="vertical">
+
+
+        <android.support.v7.widget.AppCompatTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/faq"
+          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+          android:textColor="@color/md_white_1000"/>
+
+      </LinearLayout>
+    </LinearLayout>
+  </LinearLayout>
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_add_to_playlist.xml b/app/src/main/res/layout/dialog_add_to_playlist.xml
index 9ede9d98..8908cbd7 100644
--- a/app/src/main/res/layout/dialog_add_to_playlist.xml
+++ b/app/src/main/res/layout/dialog_add_to_playlist.xml
@@ -1,27 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/title"
-        fontPath="@string/circular_std_black"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="14dp"
-        android:text="@string/add_playlist_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        tools:ignore="MissingPrefix" />
+      android:id="@+id/title"
+      fontPath="@string/circular_std_black"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:padding="14dp"
+      android:text="@string/add_playlist_title"
+      android:textAppearance="@style/TextAppearance.AppCompat.Title"
+      tools:ignore="MissingPrefix"/>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?dividerColor" />
+    <code.name.monkey.retromusic.views.IconImageView
+      android:id="@+id/action_add_playlist"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="0"
+      android:padding="12dp"
+      android:text="@string/new_playlist_title"
+      app:srcCompat="@drawable/ic_playlist_add_white_24dp"/>
+  </LinearLayout>
 
-    <code.name.monkey.retromusic.views.BottomSheetListView
-        android:id="@+id/playlists"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="?dividerColor"/>
+
+
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/playlists"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml
new file mode 100644
index 00000000..2945006e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <FrameLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:ignore="UnusedAttribute">
+
+    <include layout="@layout/status_bar"/>
+
+  </FrameLayout>
+
+  <android.support.design.widget.CoordinatorLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.design.widget.AppBarLayout
+      android:id="@+id/appbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      tools:ignore="UnusedAttribute">
+
+      <android.support.design.widget.CollapsingToolbarLayout
+        android:id="@+id/collapsing_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="62dp"
+        app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
+        app:titleEnabled="false">
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="48dp"
+          app:layout_collapseMode="parallax"
+          app:layout_collapseParallaxMultiplier="0.7"/>
+
+        <android.support.v7.widget.Toolbar
+          android:id="@+id/home_toolbar"
+          style="@style/Toolbar48"
+          tools:ignore="UnusedAttribute">
+
+          <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <code.name.monkey.retromusic.views.IconImageView
+              android:id="@+id/search"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_weight="0"
+              android:padding="12dp"
+              android:src="@drawable/ic_search_white_24dp"/>
+
+            <TextView
+              android:id="@+id/title"
+              fontPath="@string/circular_std_black"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:gravity="center"
+              android:text="@string/app_name"
+              android:textAppearance="@style/TextAppearance.AppCompat.Large"
+              tools:ignore="MissingPrefix"/>
+
+            <code.name.monkey.retromusic.views.CircularImageView
+              android:id="@+id/user_image"
+              android:layout_width="32dp"
+              android:layout_height="32dp"
+              android:layout_weight="0"
+              android:layout_marginEnd="16dp"
+              app:civ_border="false"/>
+          </LinearLayout>
+        </android.support.v7.widget.Toolbar>
+      </android.support.design.widget.CollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.widget.NestedScrollView
+      android:id="@+id/nested_scroll"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/overlap_toolbar_height"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+      <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_bottom_sheet_dialog_fragment"
+        android:descendantFocusability="blocksDescendants"
+        android:elevation="4dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <include layout="@layout/abs_playlists"/>
+
+        <include layout="@layout/home_section_content"/>
+      </LinearLayout>
+    </android.support.v4.widget.NestedScrollView>
+  </android.support.design.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 1c5da267..d4bc2db2 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -1,92 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <FrameLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="0dp"
+    tools:ignore="UnusedAttribute">
+
+    <include layout="@layout/status_bar"/>
+
+  </FrameLayout>
+
+  <android.support.design.widget.CoordinatorLayout
+    android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_weight="1">
+
+    <android.support.design.widget.AppBarLayout
+      android:id="@+id/appbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      tools:ignore="UnusedAttribute">
+
+      <android.support.design.widget.CollapsingToolbarLayout
+        android:id="@+id/collapsing_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="62dp"
+        app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
+        app:titleEnabled="false">
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="48dp"
+          app:layout_collapseMode="parallax"
+          app:layout_collapseParallaxMultiplier="0.7"/>
+
+        <FrameLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content">
+
+          <ViewStub
+            android:id="@+id/cab_stub"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            app:layout_collapseMode="parallax"
+            app:layout_collapseParallaxMultiplier="0.7"/>
+
+          <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar48"
+            tools:ignore="UnusedAttribute">
+
+            <LinearLayout
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_vertical"
+              android:orientation="horizontal">
+
+              <TextView
+                android:id="@+id/title"
+                fontPath="@string/circular_std_black"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/folders"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                tools:ignore="MissingPrefix"/>
+
+            </LinearLayout>
+          </android.support.v7.widget.Toolbar>
+        </FrameLayout>
+      </android.support.design.widget.CollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
 
     <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        tools:ignore="UnusedAttribute">
+      android:id="@+id/container"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_marginTop="@dimen/overlap_toolbar_height"
+      android:background="@drawable/bg_circular_top_corners"
+      android:elevation="@dimen/card_elevation"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <include layout="@layout/status_bar" />
+      <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:layoutAnimation="@anim/layout_animation_fall_down"
+        android:scrollbars="none"/>
+
+      <TextView
+        android:id="@android:id/empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/empty"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="@dimen/empty_text_size"/>
 
     </FrameLayout>
 
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/coordinator_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
+  </android.support.design.widget.CoordinatorLayout>
 
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:ignore="UnusedAttribute">
-
-            <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="96dp"
-                app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
-                app:expandedTitleGravity="top"
-                app:expandedTitleMarginStart="16dp"
-                app:expandedTitleMarginTop="48dp"
-                app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
-                    tools:ignore="UnusedAttribute" />
-            </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-
-            <ViewStub
-                android:id="@+id/cab_stub"
-                android:layout_width="match_parent"
-                android:layout_height="48dp" />
-
-        </android.support.design.widget.AppBarLayout>
-
-        <FrameLayout
-            android:id="@+id/container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:layoutAnimation="@anim/layout_animation_fall_down"
-                android:scrollbars="none" />
-
-            <TextView
-                android:id="@android:id/empty"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/empty"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="@dimen/empty_text_size" />
-
-        </FrameLayout>
-
-    </android.support.design.widget.CoordinatorLayout>
-
-    <code.name.monkey.retromusic.views.BreadCrumbLayout
-        android:id="@+id/bread_crumbs"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/tab_height"
-        android:layout_weight="0"
-        android:elevation="6dp"
-        android:paddingEnd="8dp"
-        android:paddingLeft="60dp"
-        android:paddingRight="8dp"
-        android:paddingStart="60dp" />
+  <code.name.monkey.retromusic.views.BreadCrumbLayout
+    android:id="@+id/bread_crumbs"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/tab_height"
+    android:layout_weight="0"
+    android:paddingStart="60dp"
+    android:paddingEnd="8dp"
+    android:elevation="6dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 0d918197..c8f50599 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,102 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-  <android.support.design.widget.AppBarLayout
-    android:id="@+id/appbar"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:focusable="true"
-    tools:ignore="UnusedAttribute">
+    android:layout_height="match_parent">
 
-    <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
-      android:id="@+id/collapsing_toolbar"
-      android:layout_width="match_parent"
-      android:layout_height="228dp"
-      app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
-      app:contentScrim="?attr/colorPrimary"
-      app:expandedTitleGravity="top"
-      app:expandedTitleMarginStart="16dp"
-      app:expandedTitleMarginTop="48dp"
-      app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-      app:layout_scrollFlags="scroll|exitUntilCollapsed"
-      app:statusBarScrim="?attr/colorPrimary"
-      app:titleEnabled="false">
-
-      <ImageView
-        android:id="@+id/image"
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        app:layout_collapseMode="pin"
-        tools:ignore="ContentDescription"/>
-
-      <android.support.v7.widget.Toolbar
-        android:id="@+id/home_toolbar"
-        style="@style/Toolbar"
+        android:layout_height="wrap_content"
+        android:focusable="true"
         tools:ignore="UnusedAttribute">
 
+        <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="228dp"
+            app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
+            app:contentScrim="?attr/colorPrimary"
+            app:expandedTitleGravity="top"
+            app:expandedTitleMarginStart="16dp"
+            app:expandedTitleMarginTop="48dp"
+            app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:statusBarScrim="?attr/colorPrimary"
+            app:titleEnabled="false">
+
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                app:layout_collapseMode="pin"
+                tools:ignore="ContentDescription" />
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/home_toolbar"
+                style="@style/Toolbar"
+                tools:ignore="UnusedAttribute">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <code.name.monkey.retromusic.views.IconImageView
+                        android:id="@+id/search"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:padding="16dp"
+                        android:src="@drawable/ic_search_white_24dp" />
+
+                    <TextView
+                        android:id="@+id/title"
+                        fontPath="@string/circular_std_black"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@string/app_name"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                        tools:ignore="MissingPrefix" />
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/user_image"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_weight="0"
+                        app:civ_border="false" />
+                </LinearLayout>
+            </android.support.v7.widget.Toolbar>
+        </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.widget.NestedScrollView
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_bottom_sheet_dialog_fragment"
+        android:elevation="@dimen/card_elevation"
+        app:behavior_overlapTop="24dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
         <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:gravity="center_vertical"
-          android:orientation="horizontal">
-
-          <code.name.monkey.retromusic.views.IconImageView
-            android:id="@+id/search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:padding="16dp"
-            android:src="@drawable/ic_search_white_24dp"/>
-
-          <TextView
-            android:id="@+id/title"
-            fontPath="@string/circular_std_black"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            tools:ignore="MissingPrefix"/>
+            android:descendantFocusability="blocksDescendants"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical">
 
-          <code.name.monkey.retromusic.views.CircularImageView
-            android:id="@+id/user_image"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_weight="0"
-            android:layout_marginEnd="16dp"
-            app:civ_border="false"/>
+            <include layout="@layout/abs_playlists" />
+
+            <include layout="@layout/home_section_content" />
         </LinearLayout>
-      </android.support.v7.widget.Toolbar>
-    </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-  </android.support.design.widget.AppBarLayout>
-
-  <android.support.v4.widget.NestedScrollView
-    android:id="@+id/nested_scroll"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:behavior_overlapTop="24dp"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    <LinearLayout
-      android:id="@+id/container"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="@drawable/bg_bottom_sheet_dialog_fragment"
-      android:descendantFocusability="blocksDescendants"
-      android:elevation="@dimen/card_elevation"
-      android:focusable="true"
-      android:focusableInTouchMode="true"
-      android:orientation="vertical">
-
-      <include layout="@layout/abs_playlists"/>
-
-      <include layout="@layout/home_section_content"/>
-    </LinearLayout>
-  </android.support.v4.widget.NestedScrollView>
+    </android.support.v4.widget.NestedScrollView>
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 0a318852..3c65852b 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -20,11 +20,9 @@
     android:layout_height="match_parent">
 
     <android.support.design.widget.AppBarLayout
-      android:id="@+id/appbar"
+      android:id="@+id/app_bar"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/colorPrimary"
-      tools:ignore="UnusedAttribute">
+      android:layout_height="wrap_content">
 
       <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
         android:id="@+id/collapsing_toolbar"
@@ -35,34 +33,25 @@
         app:expandedTitleMarginStart="16dp"
         app:expandedTitleMarginTop="48dp"
         app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-        app:layout_scrollFlags="scroll|exitUntilCollapsed">
+        app:layout_scrollFlags="scroll|exitUntilCollapsed"
+        app:title="@string/action_settings">
 
         <View
           android:layout_width="match_parent"
-          android:layout_height="48dp"
-          app:layout_collapseMode="parallax"
-          app:layout_collapseParallaxMultiplier="0.7"/>
+          android:layout_height="wrap_content"/>
 
         <android.support.v7.widget.Toolbar
           android:id="@+id/toolbar"
           style="@style/Toolbar48"
-          android:background="?attr/colorPrimary"
-          tools:ignore="UnusedAttribute"/>
+          app:layout_collapseMode="pin"/>
 
       </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-
-      <ViewStub
-        android:id="@+id/cab_stub"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        app:layout_collapseMode="parallax"
-        app:layout_collapseParallaxMultiplier="0.7"/>
     </android.support.design.widget.AppBarLayout>
 
     <FrameLayout
       android:id="@+id/fragment_container"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="match_parent"
       app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
   </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index 89fa5177..8dd49a97 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardCornerRadius="3dp"
+    app:cardCornerRadius="8dp"
     app:cardElevation="3dp"
     app:cardUseCompatPadding="true"
     tools:ignore="MissingPrefix">
diff --git a/app/src/main/res/layout/item_card_color.xml b/app/src/main/res/layout/item_card_color.xml
index aaff0740..2b4ad136 100644
--- a/app/src/main/res/layout/item_card_color.xml
+++ b/app/src/main/res/layout/item_card_color.xml
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="3dp"
-    app:cardElevation="3dp"
-    app:cardUseCompatPadding="true"
-    tools:ignore="MissingPrefix">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  app:cardCornerRadius="8dp"
+  app:cardElevation="3dp"
+  app:cardUseCompatPadding="true"
+  tools:ignore="MissingPrefix">
 
-    <LinearLayout
-        android:id="@+id/palette_color_container"
+  <LinearLayout
+    android:id="@+id/palette_color_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?rectSelector"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:ignore="UnusedAttribute,UselessParent">
+
+    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
+
+      <ImageView
+        android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?rectSelector"
-        android:gravity="center"
-        android:orientation="vertical"
-        tools:ignore="UnusedAttribute,UselessParent">
+        android:scaleType="centerCrop"
+        tools:ignore="ContentDescription"/>
 
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-            <ImageView
-                android:id="@+id/image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                tools:ignore="ContentDescription" />
+    <LinearLayout
 
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:padding="12dp"
+      android:gravity="center_vertical"
+      android:orientation="vertical">
 
-        <LinearLayout
+      <TextView
+        android:id="@+id/title"
+        fontPath="@string/circular_std_black"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColorPrimary"/>
 
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:padding="12dp">
-
-            <TextView
-                android:id="@+id/title"
-                fontPath="@string/circular_std_black"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <TextView
-                android:id="@+id/text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="4dp"
-                android:singleLine="true"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textSize="12sp" />
-        </LinearLayout>
+      <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="4dp"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="12sp"/>
     </LinearLayout>
+  </LinearLayout>
 </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/item_playlist.xml b/app/src/main/res/layout/item_playlist.xml
index 0b2bd4e5..25db611b 100644
--- a/app/src/main/res/layout/item_playlist.xml
+++ b/app/src/main/res/layout/item_playlist.xml
@@ -1,70 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:id="@+id/root_layout"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  android:background="?attr/rectSelector"
+  android:clickable="true"
+  android:focusable="true"
   android:orientation="vertical">
 
-  <android.support.v7.widget.CardView
-    android:id="@+id/image_container"
+  <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+    android:id="@+id/title"
     android:layout_width="match_parent"
-    android:layout_height="182dp"
-    app:cardCornerRadius="8dp"
-    app:cardElevation="6dp"
-    app:cardUseCompatPadding="true">
+    android:layout_height="wrap_content"
+    android:padding="12dp"
+    android:ellipsize="end"
+    android:maxLines="2"
+    android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
 
-    <View
-      android:id="@+id/gradient_background"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:background="@drawable/gradient_3"
-      android:scaleType="centerCrop"/>
-
-    <android.support.v7.widget.AppCompatImageButton
-      android:id="@+id/play_songs"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="12dp"
-      android:layout_gravity="bottom|end"
-      android:padding="12dp"
-      android:background="@drawable/color_circle_gradient"
-      android:backgroundTint="@color/eighty_percent_black_overlay"
-      app:srcCompat="@drawable/ic_play_arrow_white_24dp"/>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
-      android:orientation="vertical">
-
-      <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingTop="8dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:alpha="0.75"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/md_white_1000"
-        tools:ignore="MissingPrefix"
-        tools:text="My top tracks"/>
-
-      <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/title"
-        fontPath="@string/circular_std_black"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="8dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-        android:textColor="@color/md_white_1000"
-        tools:ignore="MissingPrefix"
-        tools:text="My top tracks"/>
-    </LinearLayout>
-  </android.support.v7.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/user_action_details.xml b/app/src/main/res/layout/user_action_details.xml
index 4eb40357..5119cfdd 100644
--- a/app/src/main/res/layout/user_action_details.xml
+++ b/app/src/main/res/layout/user_action_details.xml
@@ -36,8 +36,8 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="2"
-                android:paddingEnd="16dp"
                 android:paddingStart="16dp"
+                android:paddingEnd="16dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textStyle="bold"
                 tools:ignore="MissingPrefix" />
@@ -47,8 +47,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:paddingEnd="16dp"
                 android:paddingStart="16dp"
+                android:paddingEnd="16dp"
                 android:text="@string/lets_play_something" />
 
         </LinearLayout>
@@ -58,8 +58,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingEnd="4dp"
-        android:paddingStart="4dp">
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp">
 
         <LinearLayout
             android:id="@+id/action_folder"
@@ -92,37 +92,6 @@
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/action_settings"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?rectSelector"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <code.name.monkey.retromusic.views.IconImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                app:srcCompat="@drawable/ic_settings_white_24dp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="16dp">
-
-                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:text="@string/action_settings"
-                    android:textSize="@dimen/ate_default_textsize_subheading" />
-
-            </LinearLayout>
-        </LinearLayout>
-
         <LinearLayout
             android:id="@+id/action_sleep_timer"
             android:layout_width="match_parent"
@@ -154,6 +123,38 @@
             </LinearLayout>
         </LinearLayout>
 
+
+        <LinearLayout
+            android:id="@+id/action_settings"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rectSelector"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <code.name.monkey.retromusic.views.IconImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="12dp"
+                app:srcCompat="@drawable/ic_settings_white_24dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="marquee"
+                    android:singleLine="true"
+                    android:text="@string/action_settings"
+                    android:textSize="@dimen/ate_default_textsize_subheading" />
+
+            </LinearLayout>
+        </LinearLayout>
+
         <LinearLayout
             android:id="@+id/action_about"
             android:layout_width="match_parent"
@@ -184,5 +185,35 @@
 
             </LinearLayout>
         </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/action_buy_pro"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rectSelector"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <code.name.monkey.retromusic.views.IconImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="12dp"
+                app:srcCompat="@drawable/ic_card_giftcard_white_24dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="marquee"
+                    android:singleLine="true"
+                    android:text="@string/buy_retromusic_pro"
+                    android:textSize="@dimen/ate_default_textsize_subheading" />
+            </LinearLayout>
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 895442ea..723db856 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -8,11 +8,13 @@
     android:icon="@drawable/ic_search_white_24dp"
     android:title="@string/action_search"
     app:showAsAction="ifRoom"/>
+
   <item
     android:id="@+id/action_shuffle_all"
     android:icon="@drawable/ic_shuffle_white_24dp"
     android:title="@string/action_shuffle_all"
     app:showAsAction="never"/>
+
   <item
     android:id="@+id/action_grid_size"
     android:title="@string/action_grid_size">
@@ -48,22 +50,26 @@
       </group>
     </menu>
   </item>
+
   <item
     android:id="@+id/action_sort_order"
     android:title="@string/action_sort_order">
     <menu>
     </menu>
   </item>
+
   <item
     android:id="@+id/action_sleep_timer"
     android:orderInCategory="98"
     android:title="@string/action_sleep_timer"
     app:showAsAction="never"/>
+
   <item
     android:id="@+id/action_equalizer"
     android:orderInCategory="99"
     android:title="@string/equalizer"
     app:showAsAction="never"/>
+
   <item
     android:id="@+id/action_settings"
     android:orderInCategory="100"