diff --git a/android_app/app/src/main/res/layout/activity_usersettings.xml b/android_app/app/src/main/res/layout/activity_usersettings.xml
index 81deec2b..7a099d3a 100644
--- a/android_app/app/src/main/res/layout/activity_usersettings.xml
+++ b/android_app/app/src/main/res/layout/activity_usersettings.xml
@@ -16,7 +16,7 @@
             android:orientation="vertical"
             android:padding="5dp" >
 
-        <TableLayout
+            <TableLayout
                 android:id="@+id/tableUserData"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -165,25 +165,25 @@
 
                 </TableRow>
 
-            <TableRow
-                android:id="@+id/tableRowInitialWeight"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/lblInitialWeight"
+                <TableRow
+                    android:id="@+id/tableRowInitialWeight"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/label_initial_weight" />
+                    android:layout_height="wrap_content" >
 
-                <EditText
-                    android:id="@+id/txtInitialWeight"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:hint="@string/info_enter_initial_weight"
-                    android:inputType="numberDecimal|numberSigned" />
-            </TableRow>
+                    <TextView
+                        android:id="@+id/lblInitialWeight"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/label_initial_weight" />
+
+                    <EditText
+                        android:id="@+id/txtInitialWeight"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:hint="@string/info_enter_initial_weight"
+                        android:inputType="numberDecimal|numberSigned" />
+                </TableRow>
 
                 <TableRow
                     android:id="@+id/rowGoalWeight"
@@ -229,42 +229,38 @@
 
             </TableLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <Button
+                    android:id="@+id/btnCancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:background="@drawable/flat_selector"
+                    android:text="@string/label_cancel"
+                    android:layout_marginRight="10dp" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <Button
-                android:id="@+id/btnCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:background="@drawable/flat_selector"
-                android:text="@string/label_cancel"
-                android:layout_marginRight="10dp" />
+                <Button
+                    android:id="@+id/btnDelete"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:background="@drawable/flat_selector"
+                    android:text="@string/label_delete"
+                    android:layout_marginRight="10dp" />
 
-            <Button
-                android:id="@+id/btnDelete"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:background="@drawable/flat_selector"
-                android:text="@string/label_delete"
-                android:layout_marginRight="10dp" />
+                <Button
+                    android:id="@+id/btnOk"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:background="@drawable/flat_selector"
+                    android:text="@string/label_ok" />
+            </LinearLayout>
 
-            <Button
-                android:id="@+id/btnOk"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:background="@drawable/flat_selector"
-                android:text="@string/label_ok" />
         </LinearLayout>
-
-</LinearLayout>
     </ScrollView>
 
-
-
-
 </LinearLayout>