diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
index 535bb29..cc62199 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
@@ -238,6 +238,7 @@ public class MainView extends BaseActivity<MainMvp.View, MainPresenter> implemen
 
     @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+        Logger.e(requestCode, resultCode, requestCode == PermissionsHelper.OVERLAY_PERMISSION_REQ_CODE);
         if (requestCode == PermissionsHelper.OVERLAY_PERMISSION_REQ_CODE) {
             if (resultCode == Activity.RESULT_OK) onStartService();//start service since the user wanted to in the first time.
         }
diff --git a/app/src/main/res/layouts/main_layouts/layout/whats_new_layout.xml b/app/src/main/res/layouts/main_layouts/layout/whats_new_layout.xml
index cfc202c..faddd8f 100644
--- a/app/src/main/res/layouts/main_layouts/layout/whats_new_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/whats_new_layout.xml
@@ -122,7 +122,7 @@
                         android:layout_marginStart="@dimen/spacing_xs_large"
                         android:drawablePadding="@dimen/spacing_xs_large"
                         android:drawableStart="@drawable/ic_dot"
-                        android:text="(New) Revamping of FA from the ground to make it more faster and efficient."
+                        android:text="@string/whats_new_point_1"
                         android:textColor="@color/primary_text"/>
 
                     <com.fastaccess.ui.widgets.FontTextView
@@ -135,7 +135,7 @@
                         android:layout_marginStart="@dimen/spacing_xs_large"
                         android:drawablePadding="@dimen/spacing_xs_large"
                         android:drawableStart="@drawable/ic_dot"
-                        android:text="(New) Now you can Backup &amp; Restore your data from any device."
+                        android:text="@string/whats_new_point_2"
                         android:textColor="@color/primary_text"/>
 
                     <com.fastaccess.ui.widgets.FontTextView
@@ -148,7 +148,7 @@
                         android:layout_marginStart="@dimen/spacing_xs_large"
                         android:drawablePadding="@dimen/spacing_xs_large"
                         android:drawableStart="@drawable/ic_dot"
-                        android:text="(New) Design that makes it easy &amp; friendly to use FA"
+                        android:text="@string/whats_new_point_3"
                         android:textColor="@color/primary_text"/>
 
                     <com.fastaccess.ui.widgets.FontTextView
@@ -161,7 +161,7 @@
                         android:layout_marginStart="@dimen/spacing_xs_large"
                         android:drawablePadding="@dimen/spacing_xs_large"
                         android:drawableStart="@drawable/ic_dot"
-                        android:text="(NEW) Folders mode, now you can categorize your apps under folders."
+                        android:text="@string/whats_new_point_4"
                         android:textColor="@color/primary_text"/>
 
                     <com.fastaccess.ui.widgets.FontTextView
@@ -174,7 +174,20 @@
                         android:layout_marginStart="@dimen/spacing_xs_large"
                         android:drawablePadding="@dimen/spacing_xs_large"
                         android:drawableStart="@drawable/ic_dot"
-                        android:text="FA is an open source app, you can check the source code from the settings screen."
+                        android:text="@string/whats_new_point_5"
+                        android:textColor="@color/primary_text"/>
+
+                    <com.fastaccess.ui.widgets.FontTextView
+                        style="@style/TextAppearance.AppCompat.Medium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="start"
+                        android:layout_marginBottom="@dimen/spacing_normal"
+                        android:layout_marginEnd="@dimen/spacing_xs_large"
+                        android:layout_marginStart="@dimen/spacing_xs_large"
+                        android:drawablePadding="@dimen/spacing_xs_large"
+                        android:drawableStart="@drawable/ic_dot"
+                        android:text="@string/whats_new_point_6"
                         android:textColor="@color/primary_text"/>
 
                 </LinearLayout>
diff --git a/app/src/main/res/layouts/row_layouts/layout/folder_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/folder_row_item.xml
index 765adee..dcdde4f 100644
--- a/app/src/main/res/layouts/row_layouts/layout/folder_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/folder_row_item.xml
@@ -72,6 +72,7 @@
                 android:layout_weight="1"
                 android:background="?selectableItemBackground"
                 android:gravity="center"
+                android:maxLines="1"
                 android:padding="@dimen/spacing_normal"
                 android:text="@string/delete"
                 android:textColor="#ff00"/>
@@ -86,6 +87,7 @@
                 android:layout_weight="1"
                 android:background="?selectableItemBackground"
                 android:gravity="center"
+                android:maxLines="1"
                 android:padding="@dimen/spacing_normal"
                 android:text="@string/apps"
                 android:textColor="?colorPrimary"/>
@@ -100,11 +102,11 @@
                 android:layout_weight="1"
                 android:background="?selectableItemBackground"
                 android:gravity="center"
+                android:maxLines="1"
                 android:padding="@dimen/spacing_normal"
                 android:text="@string/edit"
                 android:textColor="?colorAccent"/>
 
-
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e029eb..2151c48 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="linear_layout_manager" translatable="false">com.fastaccess.ui.widgets.recyclerview.layout_manager.LinearManager</string>
     <string name="grid_layout_manager" translatable="false">com.fastaccess.ui.widgets.recyclerview.layout_manager.GridManager</string>
     <string name="staggered_layout_manager" translatable="false">com.fastaccess.ui.widgets.recyclerview.layout_manager.StaggeredManager</string>
-    <string name="scroll_behavior">@string/appbar_scrolling_view_behavior</string>
+    <string name="scroll_behavior" translatable="false">@string/appbar_scrolling_view_behavior</string>
     <string name="in_progress">In Progress, Please Wait…</string>
     <string name="action">Action</string>
     <string name="settings">Settings</string>
@@ -44,7 +44,6 @@
     <string name="background_title">FA Apps Background</string>
     <string name="floating_mode_title">FA Floating Mode</string>
     <string name="floating_mode_summary">Select FA floating mode.</string>
-    <string name="auto_save_position_title">Auto Save Last Position</string>
     <string name="auto_save_position_summary">Auto save last position of FA floating icon.</string>
     <string name="sticky_title">Sticky FA Floating Icon</string>
     <string name="sticky_summary">Keep FA floating icon attached to screen edges.</string>
@@ -132,4 +131,11 @@
     <string name="whats_new">What\'s New</string>
     <string name="version_name">Version:</string>
     <string name="rate_fa">Rate Fast Access</string>
+    <string name="whats_new_point_1">(New) Revamping of FA from the ground to make it more faster and efficient.</string>
+    <string name="whats_new_point_2"><![CDATA[(New) Now you can Backup & Restore your data from any device.]]></string>
+    <string name="whats_new_point_3"><![CDATA[(New) Design that makes it easy & friendly to use FA]]></string>
+    <string name="whats_new_point_4">(NEW) Folders mode, now you can categorize your apps under folders.</string>
+    <string name="whats_new_point_5"><![CDATA[(NEW)App shortcuts support for Android Nougat & supported launchers.]]></string>
+    <string name="whats_new_point_6">FA is an open source app, you can check the source code from the settings screen.</string>
+    <string name="auto_save_position_title">Auto Save Last Position</string>
 </resources>
diff --git a/art/1024x500.png b/art/1024x500.png
old mode 100755
new mode 100644
index b548d16..4ff548a
Binary files a/art/1024x500.png and b/art/1024x500.png differ
diff --git a/art/PlayStoreFA.psd b/art/1024x500.psd
old mode 100755
new mode 100644
similarity index 59%
rename from art/PlayStoreFA.psd
rename to art/1024x500.psd
index d1939fc..2e86503
Binary files a/art/PlayStoreFA.psd and b/art/1024x500.psd differ
diff --git a/art/120x180.psd b/art/120x180.psd
deleted file mode 100755
index f9c8ae1..0000000
Binary files a/art/120x180.psd and /dev/null differ