diff --git a/app/app-release.apk b/app/app-release.apk
index 404372f..e4fb436 100644
Binary files a/app/app-release.apk and b/app/app-release.apk differ
diff --git a/app/src/main/java/com/abhijitvalluri/android/fitnotifications/AppChoicesActivity.java b/app/src/main/java/com/abhijitvalluri/android/fitnotifications/AppChoicesActivity.java
index 56a7a7a..097b9bc 100644
--- a/app/src/main/java/com/abhijitvalluri/android/fitnotifications/AppChoicesActivity.java
+++ b/app/src/main/java/com/abhijitvalluri/android/fitnotifications/AppChoicesActivity.java
@@ -84,6 +84,7 @@ protected void onPostExecute(Void result) {
             setupAdapter();
         }
     }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -237,14 +238,6 @@ private AppSelection getAppSelection(String appPackageName) {
 
     private Void appListTask() {
         List<ResolveInfo> packages = Func.getInstalledPackages(mPackageManager);
-        Collections.sort(packages, new Comparator<ResolveInfo>() {
-            @Override
-            public int compare(ResolveInfo lhs, ResolveInfo rhs) {
-                return String.CASE_INSENSITIVE_ORDER.compare(
-                        lhs.loadLabel(mPackageManager).toString(),
-                        rhs.loadLabel(mPackageManager).toString());
-            }
-        });
 
         // getAppSelectionsSubList is also needed for the subsequent calls to contains()
         List<AppSelection> appSelections = mAppSelectionsStore.getAppSelections();
@@ -402,6 +395,12 @@ private class ActivityAdapter extends RecyclerView.Adapter<ActivityHolder> {
 
         public ActivityAdapter(List<AppSelection> appSelectionsSubList) {
             mAppSelectionsSubList = appSelectionsSubList;
+            Collections.sort(mAppSelectionsSubList, new Comparator<AppSelection>() {
+                @Override
+                public int compare(AppSelection lhs, AppSelection rhs) {
+                    return String.CASE_INSENSITIVE_ORDER.compare(lhs.getAppName(), rhs.getAppName());
+                }
+            });
         }
 
         @Override
diff --git a/app/src/main/java/com/abhijitvalluri/android/fitnotifications/HomeActivity.java b/app/src/main/java/com/abhijitvalluri/android/fitnotifications/HomeActivity.java
index 6dbec14..4d6439b 100644
--- a/app/src/main/java/com/abhijitvalluri/android/fitnotifications/HomeActivity.java
+++ b/app/src/main/java/com/abhijitvalluri/android/fitnotifications/HomeActivity.java
@@ -96,7 +96,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         if (mPreferences.getInt(getString(R.string.version_key), 0) < Constants.VERSION_CODE
-                && mPreferences.getInt(getString(R.string.version_key), 0) > 0) {
+                && mPreferences.getBoolean(getString(R.string.done_first_launch_key), false)) {
             // App has been updated
             AppSelectionsStore store = AppSelectionsStore.get(this);
             List<AppSelection> appSelections = store.getAppSelections();
diff --git a/app/src/main/java/com/abhijitvalluri/android/fitnotifications/setup/AppIntroActivity.java b/app/src/main/java/com/abhijitvalluri/android/fitnotifications/setup/AppIntroActivity.java
index fe442a9..b3723bf 100644
--- a/app/src/main/java/com/abhijitvalluri/android/fitnotifications/setup/AppIntroActivity.java
+++ b/app/src/main/java/com/abhijitvalluri/android/fitnotifications/setup/AppIntroActivity.java
@@ -370,6 +370,12 @@ public void onClick(View v) {
         setButtonNextFunction(BUTTON_NEXT_FUNCTION_NEXT_FINISH);
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        overridePendingTransition(R.transition.right_in, R.transition.right_out);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch(requestCode) {
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index 5d37921..9a69d41 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -2,69 +2,90 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
+              android:background="@color/white">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
-        <TextView
-            android:id="@+id/instructionsTV"
-            android:textSize="18sp"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin_landscape"
-            android:paddingBottom="@dimen/activity_vertical_margin_landscape"
-            android:text="@string/instructions"
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:foreground="@color/lightGrey_translucent"
-            android:textColor="@color/material_grey900"/>
+            android:orientation="vertical"
+            android:background="@drawable/bottom_gray_border">
+            <TextView
+                android:id="@+id/instructionsTV"
+                android:textSize="18sp"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin_landscape"
+                android:paddingBottom="@dimen/activity_vertical_margin_landscape"
+                android:text="@string/instructions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:textColor="@color/material_grey900"/>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/appSelectionTV"
-            android:textSize="18sp"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin_landscape"
-            android:paddingBottom="@dimen/activity_vertical_margin_landscape"
-            android:text="@string/app_choices"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:foreground="@color/veryLightGrey_translucent"
-            android:textColor="@color/material_grey900"/>
+            android:orientation="vertical"
+            android:background="@drawable/bottom_gray_border">
+            <TextView
+                android:id="@+id/appSelectionTV"
+                android:textSize="18sp"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin_landscape"
+                android:paddingBottom="@dimen/activity_vertical_margin_landscape"
+                android:text="@string/app_choices"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:textColor="@color/material_grey900"/>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/demoNotifTV"
-            android:textSize="18sp"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin_landscape"
-            android:paddingBottom="@dimen/activity_vertical_margin_landscape"
-            android:text="@string/test_notification"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:foreground="@color/superLightGrey_translucent"
-            android:textColor="@color/material_grey900"/>
+            android:orientation="vertical"
+            android:background="@drawable/bottom_gray_border">
+            <TextView
+                android:id="@+id/demoNotifTV"
+                android:textSize="18sp"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin_landscape"
+                android:paddingBottom="@dimen/activity_vertical_margin_landscape"
+                android:text="@string/test_notification"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:textColor="@color/material_grey900"/>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/notificationAccessTV"
-            android:textSize="18sp"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin_landscape"
-            android:paddingBottom="@dimen/activity_vertical_margin_landscape"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/notification_access_enable_textView"
-            android:background="?attr/selectableItemBackground"
-            android:foreground="@color/ultraLightGrey_translucent"
-            android:textColor="@color/material_grey900"/>
-
+            android:orientation="vertical"
+            android:background="@drawable/bottom_gray_border">
+            <TextView
+                android:id="@+id/notificationAccessTV"
+                android:textSize="18sp"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin_landscape"
+                android:paddingBottom="@dimen/activity_vertical_margin_landscape"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/notification_access_enable_textView"
+                android:background="?attr/selectableItemBackground"
+                android:textColor="@color/material_grey900"/>
+        </LinearLayout>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/activity_app_settings.xml b/app/src/main/res/layout/activity_app_settings.xml
index 43a0720..6614e33 100644
--- a/app/src/main/res/layout/activity_app_settings.xml
+++ b/app/src/main/res/layout/activity_app_settings.xml
@@ -1,93 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:padding="@dimen/activity_padding">
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:labelFor="@+id/filterText"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/filter_heading"/>
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:labelFor="@+id/filterText"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/filter_desc"/>
-
-    <EditText
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="text"
-        android:id="@+id/filterText"/>
+        android:orientation="vertical"
+        android:padding="@dimen/activity_padding"
+        android:descendantFocusability="beforeDescendants"
+        android:focusable="true"
+        android:focusableInTouchMode="true">
 
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/activity_padding"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:labelFor="@+id/filterText"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="@string/filter_heading"/>
 
-    <Switch
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/discard_empty_notifications"
-        android:id="@+id/discard_empty"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:labelFor="@+id/filterText"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/filter_desc"/>
 
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/activity_padding"/>
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:id="@+id/filterText"/>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/schedule_heading"/>
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/activity_padding"/>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/schedule_desc"/>
+        <Switch
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="@string/discard_empty_notifications"
+            android:id="@+id/discard_empty"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        style="?android:attr/buttonBarStyle">
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/activity_padding"/>
 
-        <Button
-            android:id="@+id/start_time"
-            android:layout_width="0dp"
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="3"
-            style="?android:attr/buttonBarButtonStyle"
-            tools:text="12:00 AM"
-            android:textStyle="bold"
-            android:textSize="16sp"/>
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="@string/schedule_heading"/>
 
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="to"
-            android:gravity="center"/>
+            android:text="@string/schedule_desc"/>
 
-        <Button
-            android:id="@+id/stop_time"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="3"
-            style="?android:attr/buttonBarButtonStyle"
-            tools:text="11:59 PM"
-            android:textStyle="bold"
-            android:textSize="16sp"/>
+            android:orientation="horizontal"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            style="?android:attr/buttonBarStyle">
+
+            <Button
+                android:id="@+id/start_time"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                style="?android:attr/buttonBarButtonStyle"
+                tools:text="12:00 AM"
+                android:textStyle="bold"
+                android:textSize="16sp"/>
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="to"
+                android:gravity="center"/>
+
+            <Button
+                android:id="@+id/stop_time"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                style="?android:attr/buttonBarButtonStyle"
+                tools:text="11:59 PM"
+                android:textStyle="bold"
+                android:textSize="16sp"/>
+        </LinearLayout>
     </LinearLayout>
+</ScrollView>
 
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_select_list_item.xml b/app/src/main/res/layout/app_select_list_item.xml
index 27fd632..b3ea7d5 100644
--- a/app/src/main/res/layout/app_select_list_item.xml
+++ b/app/src/main/res/layout/app_select_list_item.xml
@@ -34,7 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="@null"
+        android:background="?attr/selectableItemBackground"
         android:src="@drawable/ic_settings_black_24dp"
         android:alpha="0.5"/>
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index a6078c5..434c3bc 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -2,69 +2,90 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
+              android:background="@color/white">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
-        <TextView
-            android:id="@+id/instructionsTV"
-            android:textSize="18sp"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:text="@string/instructions"
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:foreground="@color/lightGrey_translucent"
-            android:textColor="@color/material_grey900"/>
+            android:orientation="vertical"
+            android:background="@drawable/bottom_gray_border">
+            <TextView
+                android:id="@+id/instructionsTV"
+                android:textSize="18sp"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                android:text="@string/instructions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:textColor="@color/material_grey900"/>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/appSelectionTV"
-            android:textSize="18sp"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:text="@string/app_choices"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:foreground="@color/veryLightGrey_translucent"
-            android:textColor="@color/material_grey900"/>
+            android:orientation="vertical"
+            android:background="@drawable/bottom_gray_border">
+            <TextView
+                android:id="@+id/appSelectionTV"
+                android:textSize="18sp"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                android:text="@string/app_choices"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:textColor="@color/material_grey900"/>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/demoNotifTV"
-            android:textSize="18sp"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:text="@string/test_notification"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:foreground="@color/superLightGrey_translucent"
-            android:textColor="@color/material_grey900"/>
+            android:orientation="vertical"
+            android:background="@drawable/bottom_gray_border">
+            <TextView
+                android:id="@+id/demoNotifTV"
+                android:textSize="18sp"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                android:text="@string/test_notification"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:textColor="@color/material_grey900"/>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/notificationAccessTV"
-            android:textSize="18sp"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/notification_access_enable_textView"
-            android:background="?attr/selectableItemBackground"
-            android:foreground="@color/ultraLightGrey_translucent"
-            android:textColor="@color/material_grey900"/>
-
+            android:orientation="vertical"
+            android:background="@drawable/bottom_gray_border">
+            <TextView
+                android:id="@+id/notificationAccessTV"
+                android:textSize="18sp"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/notification_access_enable_textView"
+                android:background="?attr/selectableItemBackground"
+                android:textColor="@color/material_grey900"/>
+        </LinearLayout>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml
index 9476d33..b52177b 100644
--- a/app/src/main/res/layout/fragment_info.xml
+++ b/app/src/main/res/layout/fragment_info.xml
@@ -3,21 +3,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:background="@color/white"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:background="@color/white"
     tools:context=".InfoFragment">
 
     <WebView
         android:id="@+id/infoActivityWV"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:textSize="16sp"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:paddingBottom="@dimen/activity_vertical_margin">
+        android:textSize="16sp">
     </WebView>
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index da1bfb6..6481de4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -300,6 +300,10 @@
        We will attempt to resolve this issue in an update.</p>
     ]]></string>
     <string name="whats_new_text"><![CDATA[
+    <p>Bug fixes in <b>version 2.7.1:</b></p>
+    <ul>
+        <li>Fixed bugs in Notification Schedule app setting and other general bug fixes and UI improvements.</li>
+    </ul>
     <p>Changes in <b>version 2.7</b>: New per app settings!</p>
     <ul>
         <li>You can now filter notifications from each enabled app so that notifications that contain certain text in them will not be forwarded to your Fitbit device.<br /><br /></li>
@@ -308,7 +312,7 @@
             At other times, you will not be disturbed.<br /><br /></li>
     </ul>
 
-    <p>To enable these new settings, go to the \'App Setup\' option on the main screen and click the \'gear\' icon next to the app name.</p>
+    <p>To enable these new settings, go to the \'Setup Apps\' option on the main screen and click the \'gear\' icon next to the app name.</p>
 
     ]]></string>
     <string name="opensource_text"><![CDATA[