diff --git a/skunkworks_crow/src/main/AndroidManifest.xml b/skunkworks_crow/src/main/AndroidManifest.xml
index 95979467..5a7e1fbf 100644
--- a/skunkworks_crow/src/main/AndroidManifest.xml
+++ b/skunkworks_crow/src/main/AndroidManifest.xml
@@ -33,7 +33,6 @@
         <activity android:name=".views.ui.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -45,7 +44,10 @@
                 android:value=".views.ui.main.MainActivity" />
         </activity>
         <activity android:name=".views.ui.instance.InstancesList" />
-        <activity android:name=".views.ui.settings.SettingsActivity" />
+        <activity android:name=".views.ui.settings.SettingsActivity"
+            android:parentActivityName=".views.ui.main.MainActivity">
+
+        </activity>
         <activity android:name=".views.ui.about.WebViewActivity" />
         <activity
             android:name=".views.ui.about.AboutActivity"
diff --git a/skunkworks_crow/src/main/java/org/odk/share/views/ui/settings/SettingsActivity.java b/skunkworks_crow/src/main/java/org/odk/share/views/ui/settings/SettingsActivity.java
index 6e1088e0..1c64041e 100644
--- a/skunkworks_crow/src/main/java/org/odk/share/views/ui/settings/SettingsActivity.java
+++ b/skunkworks_crow/src/main/java/org/odk/share/views/ui/settings/SettingsActivity.java
@@ -29,12 +29,15 @@
 
 import org.odk.share.R;
 
+
 /**
  * Created by laksh on 5/27/2018.
  */
 
 public class SettingsActivity extends PreferenceActivity {
 
+
+
     EditTextPreference hotspotNamePreference;
     EditTextPreference bluetoothNamePreference;
     Preference hotspotPasswordPreference;
@@ -48,11 +51,20 @@ public class SettingsActivity extends PreferenceActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
         ViewGroup root = getRootView();
         Toolbar toolbar = (Toolbar) View.inflate(this, R.layout.toolbar, null);
         toolbar.setTitle(getString(R.string.settings));
         root.addView(toolbar, 0);
+        toolbar.setNavigationIcon(R.drawable.ic_back_navigation);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressed();
+            }
+
+        });
 
         addPreferencesFromResource(R.xml.preferences_menu);
         addPreferences();
@@ -75,6 +87,7 @@ private void addPreferences() {
         btSecureModePreference = (CheckBoxPreference) findPreference(PreferenceKeys.KEY_BLUETOOTH_SECURE_MODE);
         odkDestinationDirPreference = (EditTextPreference) findPreference(PreferenceKeys.KEY_ODK_DESTINATION_DIR);
 
+
         prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
         defaultMethodPreference.setSummary(prefs.getString(PreferenceKeys.KEY_DEFAULT_TRANSFER_METHOD,
@@ -217,16 +230,16 @@ public void onShow(DialogInterface dialog) {
                 edtpass.addTextChangedListener(new TextWatcher() {
                     @Override
                     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                 
+
                     }
 
                     @Override
                     public void onTextChanged(CharSequence s, int start, int before, int count) {
 
                         if (edtpass.getText().toString().length() >= 8) {
-                            ((AlertDialog) dialog) .getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                            ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
                         } else {
-                            ((AlertDialog) dialog) .getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                            ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
                         }
                     }
 
@@ -238,12 +251,8 @@ public void afterTextChanged(Editable s) {
             }
         });
 
-
         alertDialog.show();
-
         alertDialog.setCancelable(true);
         alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
     }
-
-}
-
+}
\ No newline at end of file
diff --git a/skunkworks_crow/src/main/res/drawable/ic_back_navigation.xml b/skunkworks_crow/src/main/res/drawable/ic_back_navigation.xml
new file mode 100644
index 00000000..2c07bd63
--- /dev/null
+++ b/skunkworks_crow/src/main/res/drawable/ic_back_navigation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"
+        />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"
+        />
+</vector>
\ No newline at end of file
diff --git a/skunkworks_crow/src/main/res/layout/toolbar.xml b/skunkworks_crow/src/main/res/layout/toolbar.xml
index e7930883..7d35fa33 100644
--- a/skunkworks_crow/src/main/res/layout/toolbar.xml
+++ b/skunkworks_crow/src/main/res/layout/toolbar.xml
@@ -10,4 +10,4 @@
     app:contentInsetStart="@dimen/content_inset_start"
     app:contentInsetStartWithNavigation="@dimen/content_inset_start_with_navigation"
     app:titleTextColor="@android:color/white"
-    app:theme="@style/AppTheme.ActionBar" />
+    android:theme="@style/AppTheme.ActionBar" />
diff --git a/skunkworks_crow/src/main/res/menu/main_menu.xml b/skunkworks_crow/src/main/res/menu/main_menu.xml
index 7e6a83a1..6943c4c1 100644
--- a/skunkworks_crow/src/main/res/menu/main_menu.xml
+++ b/skunkworks_crow/src/main/res/menu/main_menu.xml
@@ -9,4 +9,7 @@
         android:id="@+id/menu_about"
         android:title="@string/about"
         app:showAsAction="never"/>
+    <item
+        android:title="Bug/Feedback"
+        />
 </menu>
\ No newline at end of file