diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c3e4a71..44411e3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,9 @@
             </intent-filter>
         </activity>
         <activity android:name=".activities.NoteEditorActivity" />
-        <activity android:name=".NoteEditorActivity"></activity>
+        <activity android:name=".NoteEditorActivity"
+            android:parentActivityName=".MainActivity" >
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/www/mnnit/com/notepod/NoteEditorActivity.java b/app/src/main/java/www/mnnit/com/notepod/NoteEditorActivity.java
index 8daec6d..8659234 100644
--- a/app/src/main/java/www/mnnit/com/notepod/NoteEditorActivity.java
+++ b/app/src/main/java/www/mnnit/com/notepod/NoteEditorActivity.java
@@ -2,6 +2,7 @@
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
@@ -55,6 +56,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
             return true;
         }
 
+        //Go back to MainActivity
+        if(id==android.R.id.home){
+            NavUtils.navigateUpFromSameTask(this);
+            return true;
+        }
         return super.onOptionsItemSelected(item);
     }
 
diff --git a/app/src/main/res/layout/fragment_note_list.xml b/app/src/main/res/layout/fragment_note_list.xml
index 0a63453..dd9613a 100644
--- a/app/src/main/res/layout/fragment_note_list.xml
+++ b/app/src/main/res/layout/fragment_note_list.xml
@@ -16,10 +16,8 @@
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_margin="16dp"
+        android:layout_gravity="bottom|right"
         android:src="@drawable/ic_add_white_24dp"
         fab:fab_colorNormal="@color/accent"
         fab:fab_colorPressed="@color/primary"