diff --git a/android_app/app/src/main/res/drawable/daysleft.png b/android_app/app/src/main/res/drawable/daysleft.png
new file mode 100644
index 00000000..60e85705
Binary files /dev/null and b/android_app/app/src/main/res/drawable/daysleft.png differ
diff --git a/android_app/app/src/main/res/drawable/difference.png b/android_app/app/src/main/res/drawable/difference.png
new file mode 100644
index 00000000..e5f0b9d8
Binary files /dev/null and b/android_app/app/src/main/res/drawable/difference.png differ
diff --git a/android_app/app/src/main/res/drawable/fat.png b/android_app/app/src/main/res/drawable/fat.png
new file mode 100644
index 00000000..395981ed
Binary files /dev/null and b/android_app/app/src/main/res/drawable/fat.png differ
diff --git a/android_app/app/src/main/res/drawable/target.png b/android_app/app/src/main/res/drawable/target.png
new file mode 100644
index 00000000..0503cdbc
Binary files /dev/null and b/android_app/app/src/main/res/drawable/target.png differ
diff --git a/android_app/app/src/main/res/drawable/weight.png b/android_app/app/src/main/res/drawable/weight.png
new file mode 100644
index 00000000..0684cf76
Binary files /dev/null and b/android_app/app/src/main/res/drawable/weight.png differ
diff --git a/android_app/app/src/main/res/layout/activity_editdata.xml b/android_app/app/src/main/res/layout/activity_editdata.xml
new file mode 100644
index 00000000..faf1b06b
--- /dev/null
+++ b/android_app/app/src/main/res/layout/activity_editdata.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="5dp" >
+
+    <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:stretchColumns="*" >
+
+            <TableRow
+                android:id="@+id/tableRow1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
+
+                <TextView
+                    android:id="@+id/textView1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_weight" />
+
+                <EditText
+                    android:id="@+id/txtWeight"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="numberDecimal|numberSigned">
+
+                    <requestFocus />
+                </EditText>
+
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/tableRow2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_fat" />
+
+                <EditText
+                    android:id="@+id/txtFat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="numberDecimal|numberSigned" />
+
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/tableRow5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
+
+                <TextView
+                    android:id="@+id/textView5"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_water" />
+
+                <EditText
+                    android:id="@+id/txtWater"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:ems="10"
+                    android:inputType="numberDecimal|numberSigned" />
+
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/tableRow6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_muscle" />
+
+                <EditText
+                    android:id="@+id/txtMuscle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="numberDecimal|numberSigned" />
+            </TableRow>
+
+        </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" />
+
+        <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>
+