diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml
index 5a702ef7..57952101 100644
--- a/android_app/app/src/main/AndroidManifest.xml
+++ b/android_app/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.health.openscale"
-    android:versionCode="6"
-    android:versionName="1.3" >
+    android:versionCode="7"
+    android:versionName="1.3.1" >
 
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
index 5cfef0d6..bd901b8b 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
@@ -15,11 +15,9 @@
 */
 package com.health.openscale.gui;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -876,19 +874,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
         }
     }
 
-    @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-
-        if (isVisibleToUser) {
-             if ((getActivity().getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != Configuration.SCREENLAYOUT_SIZE_XLARGE &&
-                (getActivity().getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != Configuration.SCREENLAYOUT_SIZE_LARGE) {
-                Activity a = getActivity();
-                if (a != null) a.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            }
-        }
-    }
-
     private class LineChartTouchListener implements LineChartOnValueSelectListener {
         @Override
         public void onValueSelected(int lineIndex, int pointIndex, PointValue pointValue) {
diff --git a/android_app/app/src/main/res/layout-large/fragment_overview.xml b/android_app/app/src/main/res/layout-large/fragment_overview.xml
new file mode 100644
index 00000000..539d2a61
--- /dev/null
+++ b/android_app/app/src/main/res/layout-large/fragment_overview.xml
@@ -0,0 +1,987 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    tools:context="com.health.openscale.MainActivity$PlaceholderFragment"
+    android:weightSum="100"
+    android:padding="10dp">
+
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/scrollView"
+        android:layout_weight="100">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_title_user"
+                    android:id="@+id/txtTitleUser"
+                    android:layout_weight="0"
+                    android:textSize="20dp"/>
+
+                <Spinner
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/spinUser"
+                    android:textSize="20dp" />
+
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dp"
+                android:background="@android:color/darker_gray"/>
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:weightSum="100">
+
+                <lecho.lib.hellocharts.view.PieChartView
+                     android:id="@+id/pieChartLast"
+                     android:layout_width="300dp"
+                     android:layout_height="200dp"
+                    android:measureWithLargestChild="false"
+                    android:layout_weight="30" />
+
+                <lecho.lib.hellocharts.view.LineChartView
+                    android:id="@+id/lineChartLast"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="70" />
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/label_title_last_measurement"
+                android:id="@+id/txtTitleLastMeasurment"
+                android:autoText="false"
+                android:textSize="20dp"
+                android:typeface="monospace" />
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dp"
+                android:background="@android:color/darker_gray"/>
+
+            <TableLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_weight="90"
+                android:stretchColumns="1">
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowWeight">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView11"
+                        android:src="@drawable/weight"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/label_weight"
+                        android:id="@+id/txtLabelWeight"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1kg"
+                        android:id="@+id/txtWeightLast"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="fill_parent"
+                        android:id="@+id/indicatorWeight" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRowGaugeWeight"
+                    android:visibility="gone"
+                    android:layout_marginBottom="10dp">
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <com.health.openscale.core.LinearGaugeView
+                        android:layout_width="fill_parent" android:layout_height="wrap_content"
+                        android:id="@+id/linearGaugeWeight" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowBMI">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView"
+                        android:src="@drawable/bmi"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/label_bmi"
+                        android:id="@+id/txtLabelBMI"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1"
+                        android:id="@+id/txtBMILast"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="fill_parent"
+                        android:id="@+id/indicatorBMI" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowGaugeBMI"
+                    android:visibility="gone">
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <com.health.openscale.core.LinearGaugeView
+                        android:layout_width="fill_parent" android:layout_height="wrap_content"
+                        android:id="@+id/linearGaugeBMI" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+                </TableRow>
+
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRowFat"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView2"
+                        android:src="@drawable/fat"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/label_fat"
+                        android:id="@+id/txtLabelFat"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1 %"
+                        android:id="@+id/txtFatLast"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical" />
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="fill_parent"
+                        android:id="@+id/indicatorFat" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowGaugeFat"
+                    android:visibility="gone">
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <com.health.openscale.core.LinearGaugeView
+                        android:layout_width="fill_parent" android:layout_height="wrap_content"
+                        android:id="@+id/linearGaugeFat" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+                </TableRow>
+
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRowMuscle"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView3"
+                        android:src="@drawable/muscle"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/label_muscle"
+                        android:id="@+id/txtLabelMuscle"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1 %"
+                        android:id="@+id/txtMuscleLast"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="fill_parent"
+                        android:id="@+id/indicatorMuscle" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowGaugeMuscle"
+                    android:visibility="gone">
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <com.health.openscale.core.LinearGaugeView
+                        android:layout_width="fill_parent" android:layout_height="wrap_content"
+                        android:id="@+id/linearGaugeMuscle" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+                </TableRow>
+
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRowWater"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView4"
+                        android:src="@drawable/water"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/label_water"
+                        android:id="@+id/txtLabelWater"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1 %"
+                        android:id="@+id/txtWaterLast"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="fill_parent"
+                        android:id="@+id/indicatorWater" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowGaugeWater"
+                    android:visibility="gone">
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <com.health.openscale.core.LinearGaugeView
+                        android:layout_width="fill_parent" android:layout_height="wrap_content"
+                        android:id="@+id/linearGaugeWater" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+                </TableRow>
+
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRowWaist"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView45"
+                        android:src="@drawable/waist"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/label_waist"
+                        android:id="@+id/txtLabelWaist"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1 %"
+                        android:id="@+id/txtWaistLast"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="fill_parent"
+                        android:id="@+id/indicatorWaist" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowGaugeWaist"
+                    android:visibility="gone">
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <com.health.openscale.core.LinearGaugeView
+                        android:layout_width="fill_parent" android:layout_height="wrap_content"
+                        android:id="@+id/linearGaugeWaist" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRowWHtR"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView456"
+                        android:src="@drawable/whtr"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/label_whtr"
+                        android:id="@+id/txtLabelWHtR"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1"
+                        android:id="@+id/txtWHtRLast"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="fill_parent"
+                        android:id="@+id/indicatorWHtR" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowGaugeWHtR"
+                    android:visibility="gone">
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <com.health.openscale.core.LinearGaugeView
+                        android:layout_width="fill_parent" android:layout_height="wrap_content"
+                        android:id="@+id/linearGaugeWHtR" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRowHip"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView16"
+                        android:src="@drawable/hip"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/label_hip"
+                        android:id="@+id/txtLabelHip"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1 %"
+                        android:id="@+id/txtHipLast"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="fill_parent"
+                        android:id="@+id/indicatorHip" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowGaugeHip"
+                    android:visibility="gone">
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <com.health.openscale.core.LinearGaugeView
+                        android:layout_width="fill_parent" android:layout_height="wrap_content"
+                        android:id="@+id/linearGaugeHip" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+                </TableRow>
+
+
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRowWHR"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView49"
+                        android:src="@drawable/whr"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/label_whr"
+                        android:id="@+id/txtLabelWHR"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1"
+                        android:id="@+id/txtWHRLast"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="fill_parent"
+                        android:id="@+id/indicatorWHR" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowGaugeWHR"
+                    android:visibility="gone">
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <com.health.openscale.core.LinearGaugeView
+                        android:layout_width="fill_parent" android:layout_height="wrap_content"
+                        android:id="@+id/linearGaugeWHR" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+
+                    <Space
+                        android:layout_width="20px"
+                        android:layout_height="20px" />
+                </TableRow>
+
+            </TableLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/label_title_goal"
+                android:id="@+id/txtTitleGoal"
+                android:autoText="false"
+                android:textSize="20dp"
+                android:typeface="monospace"
+                android:layout_marginTop="20dp" />
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dp"
+                android:background="@android:color/darker_gray"/>
+
+            <TableLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_weight="90"
+                android:stretchColumns="1">
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView5"
+                        android:src="@drawable/target"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Target weight"
+                        android:id="@+id/txtLabelGoalWeight"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1 kg"
+                        android:id="@+id/txtGoalWeight"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRow9"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView6"
+                        android:src="@drawable/difference"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Weight difference"
+                        android:id="@+id/txtLabelGoalDiff"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1 kg"
+                        android:id="@+id/txtGoalDiff"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRow10"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView7"
+                        android:src="@drawable/daysleft"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Days left"
+                        android:id="@+id/txtLabelDayLeft"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1 days"
+                        android:id="@+id/txtGoalDayLeft"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+                </TableRow>
+
+            </TableLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/label_title_statistics"
+                android:id="@+id/txtTitleStatistics"
+                android:autoText="false"
+                android:textSize="20dp"
+                android:typeface="monospace"
+                android:layout_marginTop="20dp" />
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dp"
+                android:background="@android:color/darker_gray"/>
+
+            <TableLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_weight="90"
+                android:stretchColumns="1">
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView8"
+                        android:src="@drawable/lastweek"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Last 7 days"
+                        android:id="@+id/txtLabelAvgWeek"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1"
+                        android:id="@+id/txtAvgWeek"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:id="@+id/tableRow11"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:id="@+id/imageView9"
+                        android:src="@drawable/lastmonth"
+                        android:layout_gravity="center" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Last 30 days"
+                        android:id="@+id/txtLabelAvgMonth"
+                        android:layout_column="1"
+                        android:textAlignment="center"
+                        android:singleLine="false"
+                        android:layout_marginLeft="20dp"
+                        android:password="false"
+                        android:phoneNumber="false"
+                        android:lines="2"
+                        android:layout_marginRight="50dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="-1"
+                        android:id="@+id/txtAvgMonth"
+                        android:layout_column="2"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="20dp" />
+                </TableRow>
+
+            </TableLayout>
+
+        </LinearLayout>
+    </ScrollView>
+
+    <Button
+        android:id="@+id/btnInsertData"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/flat_selector"
+        android:text="+"
+        android:textColor="@android:color/white" />
+
+
+</LinearLayout>
diff --git a/android_app/app/src/main/res/layout-large/fragment_table.xml b/android_app/app/src/main/res/layout-large/fragment_table.xml
new file mode 100644
index 00000000..a0814733
--- /dev/null
+++ b/android_app/app/src/main/res/layout-large/fragment_table.xml
@@ -0,0 +1,144 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp"
+    tools:context="com.health.openscale.MainActivity$PlaceholderFragment">
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginBottom="80dp" >
+
+        <TableLayout
+            android:id="@+id/tableDataView"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:shrinkColumns="*">
+
+            <TableRow
+                android:id="@+id/tableHeader"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_id"
+                    android:textStyle="bold"
+                    android:id="@+id/txtIdTableHeader"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_date"
+                    android:textStyle="bold"
+                    android:id="@+id/txtDateTableHeader" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_time"
+                    android:textStyle="bold"
+                    android:id="@+id/txtTimeTableHeader" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_weight"
+                    android:textStyle="bold"
+                    android:id="@+id/txtWeightTableHeader" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_fat"
+                    android:textStyle="bold"
+                    android:id="@+id/txtFatTableHeader" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_water"
+                    android:textStyle="bold"
+                    android:id="@+id/txtWaterTableHeader" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_muscle"
+                    android:textStyle="bold"
+                    android:id="@+id/txtMuscleTableHeader" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_waist"
+                    android:textStyle="bold"
+                    android:id="@+id/txtWaistTableHeader" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_hip"
+                    android:textStyle="bold"
+                    android:id="@+id/txtHipTableHeader" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_comment"
+                    android:textStyle="bold"
+                    android:id="@+id/txtCommentTableHeader" />
+
+                <Button
+                    android:id="@+id/btnDeleteAll"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/flat_selector"
+                    android:minHeight="20dp"
+                    android:minWidth="10dp"
+                    android:text="@string/label_delete_all"
+                    android:textColor="@android:color/white"
+                    android:textSize="10sp"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp" />
+
+            </TableRow>
+        </TableLayout>
+    </ScrollView>
+
+   <LinearLayout
+       android:layout_width="fill_parent"
+       android:layout_height="wrap_content"
+       android:layout_alignParentBottom="true"
+       android:layout_centerHorizontal="true"
+       android:layout_marginBottom="15dp" >
+
+       <Button
+           android:id="@+id/btnImportData"
+           android:layout_width="0dp"
+           android:layout_height="wrap_content"
+           android:layout_weight="5"
+           android:background="@drawable/flat_selector"
+           android:text="@string/label_import"
+           android:textColor="@android:color/white" />
+
+       <Space
+           android:layout_width="0dp"
+           android:layout_height="match_parent"
+           android:layout_weight="0.5" />
+
+       <Button
+           android:id="@+id/btnExportData"
+           android:layout_width="0dp"
+           android:layout_height="wrap_content"
+           android:layout_weight="5"
+           android:background="@drawable/flat_selector"
+           android:text="@string/label_export"
+           android:textColor="@android:color/white" />
+
+   </LinearLayout>
+
+</RelativeLayout>
diff --git a/android_app/app/src/main/res/layout/fragment_graph.xml b/android_app/app/src/main/res/layout/fragment_graph.xml
index 8527c291..d2b902fc 100644
--- a/android_app/app/src/main/res/layout/fragment_graph.xml
+++ b/android_app/app/src/main/res/layout/fragment_graph.xml
@@ -2,10 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
+    android:padding="5dp"
     tools:context="com.health.openscale.MainActivity$PlaceholderFragment" >
 
         <LinearLayout
diff --git a/android_app/app/src/main/res/layout/fragment_overview.xml b/android_app/app/src/main/res/layout/fragment_overview.xml
index 539d2a61..4f909dba 100644
--- a/android_app/app/src/main/res/layout/fragment_overview.xml
+++ b/android_app/app/src/main/res/layout/fragment_overview.xml
@@ -8,7 +8,7 @@
     android:layout_alignParentStart="true"
     tools:context="com.health.openscale.MainActivity$PlaceholderFragment"
     android:weightSum="100"
-    android:padding="10dp">
+    android:padding="5dp">
 
 
     <ScrollView
@@ -49,27 +49,19 @@
                 android:layout_height="1dp"
                 android:background="@android:color/darker_gray"/>
 
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:weightSum="100">
 
                 <lecho.lib.hellocharts.view.PieChartView
                      android:id="@+id/pieChartLast"
-                     android:layout_width="300dp"
-                     android:layout_height="200dp"
-                    android:measureWithLargestChild="false"
-                    android:layout_weight="30" />
+                     android:layout_width="200dp"
+                     android:layout_height="150dp"
+                    android:layout_gravity="center"/>
 
                 <lecho.lib.hellocharts.view.LineChartView
                     android:id="@+id/lineChartLast"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="70" />
+                    android:layout_height="150dp"
+                    android:layout_gravity="center"/>
 
-            </LinearLayout>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -88,50 +80,51 @@
             <TableLayout
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
-                android:layout_weight="90"
                 android:stretchColumns="1">
 
                 <TableRow
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
-                    android:layout_marginBottom="10dp"
+                    android:layout_marginBottom="5dp"
+                    android:weightSum="100"
                     android:id="@+id/tableRowWeight">
 
                     <ImageView
                         android:layout_width="wrap_content"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView11"
                         android:src="@drawable/weight"
-                        android:layout_gravity="center" />
+                        android:layout_gravity="center"/>
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="@string/label_weight"
                         android:id="@+id/txtLabelWeight"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2"/>
 
                     <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="0dp"
+                        android:layout_height="fill_parent"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1kg"
-                        android:id="@+id/txtWeightLast"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:id="@+id/txtWeightLast"
+                        android:layout_gravity="center_vertical"/>
 
                     <ImageView
-                        android:layout_width="10dp"
+                        android:layout_width="2dp"
                         android:layout_height="fill_parent"
                         android:id="@+id/indicatorWeight" />
                 </TableRow>
@@ -166,42 +159,45 @@
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
                     android:layout_marginBottom="10dp"
+                    android:weightSum="100"
                     android:id="@+id/tableRowBMI">
 
                     <ImageView
                         android:layout_width="wrap_content"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView"
                         android:src="@drawable/bmi"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="@string/label_bmi"
                         android:id="@+id/txtLabelBMI"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1"
                         android:id="@+id/txtBMILast"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical" />
 
                     <ImageView
-                        android:layout_width="10dp"
+                        android:layout_width="2dp"
                         android:layout_height="fill_parent"
                         android:id="@+id/indicatorBMI" />
                 </TableRow>
@@ -211,6 +207,7 @@
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
                     android:layout_marginBottom="10dp"
+                    android:weightSum="100"
                     android:id="@+id/tableRowGaugeBMI"
                     android:visibility="gone">
 
@@ -237,33 +234,37 @@
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
                     android:id="@+id/tableRowFat"
+                    android:weightSum="100"
                     android:layout_marginBottom="10dp">
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView2"
                         android:src="@drawable/fat"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="@string/label_fat"
                         android:id="@+id/txtLabelFat"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2"/>
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1 %"
                         android:id="@+id/txtFatLast"
@@ -271,7 +272,7 @@
                         android:layout_gravity="center_vertical" />
 
                     <ImageView
-                        android:layout_width="10dp"
+                        android:layout_width="2dp"
                         android:layout_height="fill_parent"
                         android:id="@+id/indicatorFat" />
                 </TableRow>
@@ -307,42 +308,45 @@
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
                     android:id="@+id/tableRowMuscle"
+                    android:weightSum="100"
                     android:layout_marginBottom="10dp">
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView3"
                         android:src="@drawable/muscle"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="@string/label_muscle"
                         android:id="@+id/txtLabelMuscle"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1 %"
                         android:id="@+id/txtMuscleLast"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical" />
 
                     <ImageView
-                        android:layout_width="10dp"
+                        android:layout_width="2dp"
                         android:layout_height="fill_parent"
                         android:id="@+id/indicatorMuscle" />
                 </TableRow>
@@ -382,38 +386,40 @@
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView4"
                         android:src="@drawable/water"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="@string/label_water"
                         android:id="@+id/txtLabelWater"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2"/>
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1 %"
                         android:id="@+id/txtWaterLast"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical" />
 
                     <ImageView
-                        android:layout_width="10dp"
+                        android:layout_width="2dp"
                         android:layout_height="fill_parent"
                         android:id="@+id/indicatorWater" />
                 </TableRow>
@@ -453,38 +459,40 @@
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView45"
                         android:src="@drawable/waist"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="@string/label_waist"
                         android:id="@+id/txtLabelWaist"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1 %"
                         android:id="@+id/txtWaistLast"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical" />
 
                     <ImageView
-                        android:layout_width="10dp"
+                        android:layout_width="2dp"
                         android:layout_height="fill_parent"
                         android:id="@+id/indicatorWaist" />
                 </TableRow>
@@ -523,38 +531,40 @@
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView456"
                         android:src="@drawable/whtr"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="@string/label_whtr"
                         android:id="@+id/txtLabelWHtR"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1"
                         android:id="@+id/txtWHtRLast"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical" />
 
                     <ImageView
-                        android:layout_width="10dp"
+                        android:layout_width="2dp"
                         android:layout_height="fill_parent"
                         android:id="@+id/indicatorWHtR" />
                 </TableRow>
@@ -593,35 +603,37 @@
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView16"
                         android:src="@drawable/hip"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="@string/label_hip"
                         android:id="@+id/txtLabelHip"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1 %"
                         android:id="@+id/txtHipLast"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical"/>
 
                     <ImageView
                         android:layout_width="10dp"
@@ -665,38 +677,40 @@
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView49"
                         android:src="@drawable/whr"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="@string/label_whr"
                         android:id="@+id/txtLabelWHR"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1"
                         android:id="@+id/txtWHRLast"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical" />
 
                     <ImageView
-                        android:layout_width="10dp"
+                        android:layout_width="2dp"
                         android:layout_height="fill_parent"
                         android:id="@+id/indicatorWHR" />
                 </TableRow>
@@ -734,9 +748,9 @@
                 android:text="@string/label_title_goal"
                 android:id="@+id/txtTitleGoal"
                 android:autoText="false"
-                android:textSize="20dp"
+                android:textSize="25dp"
                 android:typeface="monospace"
-                android:layout_marginTop="20dp" />
+                android:layout_marginTop="25dp" />
 
             <View
                 android:layout_width="fill_parent"
@@ -757,35 +771,37 @@
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView5"
                         android:src="@drawable/target"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="Target weight"
                         android:id="@+id/txtLabelGoalWeight"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1 kg"
                         android:id="@+id/txtGoalWeight"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical"/>
                 </TableRow>
 
                 <TableRow
@@ -797,35 +813,37 @@
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView6"
                         android:src="@drawable/difference"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="Weight difference"
                         android:id="@+id/txtLabelGoalDiff"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2"/>
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1 kg"
                         android:id="@+id/txtGoalDiff"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical"/>
                 </TableRow>
 
                 <TableRow
@@ -837,35 +855,37 @@
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView7"
                         android:src="@drawable/daysleft"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="Days left"
                         android:id="@+id/txtLabelDayLeft"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2"/>
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1 days"
                         android:id="@+id/txtGoalDayLeft"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical"/>
                 </TableRow>
 
             </TableLayout>
@@ -876,9 +896,9 @@
                 android:text="@string/label_title_statistics"
                 android:id="@+id/txtTitleStatistics"
                 android:autoText="false"
-                android:textSize="20dp"
+                android:textSize="25dp"
                 android:typeface="monospace"
-                android:layout_marginTop="20dp" />
+                android:layout_marginTop="25dp" />
 
             <View
                 android:layout_width="fill_parent"
@@ -899,35 +919,37 @@
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView8"
                         android:src="@drawable/lastweek"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="Last 7 days"
                         android:id="@+id/txtLabelAvgWeek"
                         android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2"/>
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1"
                         android:id="@+id/txtAvgWeek"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical" />
                 </TableRow>
 
                 <TableRow
@@ -935,39 +957,41 @@
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
                     android:id="@+id/tableRow11"
+                    android:weightSum="100"
                     android:layout_marginBottom="10dp">
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="25dp"
                         android:id="@+id/imageView9"
                         android:src="@drawable/lastmonth"
                         android:layout_gravity="center" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="80"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="Last 30 days"
                         android:id="@+id/txtLabelAvgMonth"
-                        android:layout_column="1"
                         android:textAlignment="center"
                         android:singleLine="false"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="5dp"
                         android:password="false"
                         android:phoneNumber="false"
-                        android:lines="2"
-                        android:layout_marginRight="50dp" />
+                        android:lines="2" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="20"
+                        android:textSize="15dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:text="-1"
                         android:id="@+id/txtAvgMonth"
                         android:layout_column="2"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginRight="20dp" />
+                        android:layout_gravity="center_vertical" />
                 </TableRow>
 
             </TableLayout>
diff --git a/android_app/app/src/main/res/layout/fragment_table.xml b/android_app/app/src/main/res/layout/fragment_table.xml
index b278acb3..193e3918 100644
--- a/android_app/app/src/main/res/layout/fragment_table.xml
+++ b/android_app/app/src/main/res/layout/fragment_table.xml
@@ -2,22 +2,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
+    android:padding="5dp"
     tools:context="com.health.openscale.MainActivity$PlaceholderFragment">
 
     <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="80dp" >
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginBottom="50dp" >
 
         <TableLayout
             android:id="@+id/tableDataView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:measureWithLargestChild="false"
             android:shrinkColumns="*">
 
             <TableRow
@@ -101,24 +97,21 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/flat_selector"
-                    android:minHeight="20dp"
-                    android:minWidth="10dp"
+                    android:minHeight="10dp"
+                    android:minWidth="5dp"
                     android:text="@string/label_delete_all"
                     android:textColor="@android:color/white"
-                    android:textSize="10sp"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp" />
+                    android:textSize="5dp" />
 
             </TableRow>
         </TableLayout>
     </ScrollView>
-   
+
    <LinearLayout
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:layout_alignParentBottom="true"
-       android:layout_centerHorizontal="true"
-       android:layout_marginBottom="15dp" >
+       android:layout_centerHorizontal="true" >
 
        <Button
            android:id="@+id/btnImportData"