diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs
index df9499ed..b2739adf 100644
--- a/src/keepass2android/EntryEditActivity.cs
+++ b/src/keepass2android/EntryEditActivity.cs
@@ -808,7 +808,7 @@ namespace keepass2android
 			        Finish();
 			        return true;
                 case Android.Resource.Id.Home:
-			        Finish();
+                    OnBackPressed();
 			        return true;
                 default:
                     return base.OnOptionsItemSelected(item);
diff --git a/src/keepass2android/Resources/layout/entry_edit.xml b/src/keepass2android/Resources/layout/entry_edit.xml
index dc4440c1..2929a733 100644
--- a/src/keepass2android/Resources/layout/entry_edit.xml
+++ b/src/keepass2android/Resources/layout/entry_edit.xml
@@ -161,7 +161,7 @@ android:layout_height="wrap_content"
     </LinearLayout>
 
     <LinearLayout
-    android:id="@+id/entry_binaries_label"
+    android:id="@+id/entry_extras_label"
             style="@style/EntryEditSingleLine_container">
       <ImageView
           style="@style/EntryEditSingleLine_ImageView"
@@ -299,228 +299,5 @@ android:layout_height="wrap_content"
       </LinearLayout>
     </LinearLayout>
 
-    <!--<RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-          
-        -->
-    <!-- Title -->
-    <!--
-            <ImageButton
-                android:id="@+id/icon_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:src="@drawable/ic00" />
-            <EditText
-                android:id="@+id/entry_title"
-                style="@style/TextAppearance_EditEntry_Value"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dip"
-                android:capitalize="sentences"
-                android:layout_toLeftOf="@+id/icon_button"
-                android:hint="@string/hint_title"
-                android:singleLine="true" />
-        -->
-    <!-- Username -->
-    <!--
-            <EditText
-                
-                style="@style/TextAppearance_EditEntry_Value"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dip"
-                android:layout_below="@id/icon_button"
-                android:id="@+id/entry_user_name"
-                android:hint="@string/hint_username"
-                android:inputType="textEmailAddress"
-                android:singleLine="true" />
-        -->
-    <!-- URL -->
-    <!--
-            <EditText
-                style="@style/TextAppearance_EditEntry_Value"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dip"
-                android:layout_below="@id/entry_user_name"
-                android:id="@+id/entry_url"
-                android:hint="@string/hint_url"
-                android:inputType="textUri"
-                android:singleLine="true" />
-        -->
-    <!-- Password -->
-    <!--
-            <TextView
-                android:id="@+id/entry_password_label"
-                style="@style/TextAppearance_EditEntry_LabelSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_url"
-                android:text="@string/entry_password" />
-             <RelativeLayout
-			android:id="@+id/password_section"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/entry_password_label">
-			
-		<Button
-			android:id="@+id/generate_button"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:text="@string/ellipsis" />
-			<ImageButton
-        android:id="@+id/toggle_password"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_menu_view"
-		android:layout_alignTop="@id/generate_button"
-        android:layout_toLeftOf="@id/generate_button"
-         />
-		<EditText
-			android:id="@+id/entry_password"
-			style="@style/TextAppearance_EditEntry_Value"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignTop="@id/generate_button"
-			android:layout_toLeftOf="@id/toggle_password"
-			android:hint="@string/hint_pass"
-			android:inputType="textPassword"
-			android:singleLine="true"
-			android:typeface="monospace" />
-		-->
-    <!-- Confirm Password -->
-    <!--
-		<EditText
-			android:id="@+id/entry_confpassword"
-			style="@style/TextAppearance_EditEntry_Value"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/entry_password"
-			android:hint="@string/hint_conf_pass"
-			android:inputType="textPassword"
-			android:singleLine="true"
-			android:typeface="monospace" />
-
-		</RelativeLayout>
-        -->
-    <!-- Comment -->
-    <!--
-            <TextView
-                android:id="@+id/entry_comment_label"
-                style="@style/TextAppearance_EditEntry_LabelSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/password_section"
-                android:text="@string/entry_comment" />
-            <EditText
-                style="@style/TextAppearance_EditEntry_Value"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_comment_label"
-                android:id="@+id/entry_comment"
-                android:hint="@string/hint_comment"
-                android:inputType="textMultiLine" />
-        -->
-    <!-- Extra strings -->
-    <!--
-            <LinearLayout
-                android:id="@+id/advanced_container"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_comment"
-                android:orientation="vertical" />
-            <Button
-                android:id="@+id/add_advanced"
-                style="@style/EditEntryButton"
-                android:layout_marginTop="-4dp"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/advanced_container"
-                android:drawableLeft="?attr/ic_menu_add_field"
-                android:text="@string/add_extra_string" />
-        -->
-    <!-- file attachments -->
-    <!--
-            <TextView
-                android:id="@+id/entry_binaries_label"
-                style="@style/TextAppearance_EditEntry_LabelSmall"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/add_advanced"
-                android:text="@string/entry_binaries" />
-            <LinearLayout
-                android:id="@+id/binaries"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_binaries_label"
-                android:orientation="vertical" />
-        -->
-    <!-- Tags -->
-    <!--
-            <TextView
-                android:id="@+id/entry_tags_label"
-                style="@style/TextAppearance_EditEntry_LabelSmall"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/binaries"
-                android:text="@string/entry_tags" />
-            <EditText
-                
-                style="@style/TextAppearance_EditEntry_Value"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_tags_label"
-                android:id="@+id/entry_tags"
-                android:hint="@string/hint_tags"
-                android:inputType="text"
-                android:singleLine="true" />
-        -->
-    <!-- Override URL -->
-    <!--
-            <TextView
-                android:id="@+id/entry_override_url_label"
-                style="@style/TextAppearance_EditEntry_LabelSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_tags"
-                android:text="@string/entry_override_url" />
-            <EditText
-                android:id="@+id/entry_override_url"
-                style="@style/TextAppearance_EditEntry_Value"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_override_url_label"
-                android:id="@+id/entry_override_url"
-                android:hint="@string/hint_override_url"
-                android:inputType="textUri"
-                android:singleLine="true" />
-        -->
-    <!-- Expires -->
-    <!--
-            <TextView
-                android:id="@+id/entry_expires_label"
-                style="@style/TextAppearance_EditEntry_LabelSmall"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_override_url"
-                android:text="@string/entry_expires" />
-            <CheckBox
-                android:id="@+id/entry_expires_checkbox"
-                android:layout_marginLeft="16dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_expires_label" />
-            <EditText
-                android:id="@+id/entry_expires"
-                android:layout_marginLeft="-12dip"
-                android:layout_marginRight="12dip"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_expires_label"
-                android:layout_toRightOf="@id/entry_expires_checkbox" />
-        </RelativeLayout>-->
   </LinearLayout>
 </ScrollView>