diff --git a/android_app/app/src/main/java/com/health/openscale/gui/EditDataActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/EditDataActivity.java
index a4262eac..7e078630 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/EditDataActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/EditDataActivity.java
@@ -17,10 +17,13 @@ package com.health.openscale.gui;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TableRow;
 
 import com.health.openscale.R;
 import com.health.openscale.core.OpenScale;
@@ -76,6 +79,23 @@ public class EditDataActivity extends Activity {
 
         setTitle(getResources().getString(R.string.title_edit_data_entry) + ": " + DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(editScaleData.date_time));
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+        if(!prefs.getBoolean("fatEnable", true)) {
+            TableRow row = (TableRow)findViewById(R.id.tableRowFat);
+            row.setVisibility(View.GONE);
+        }
+
+        if(!prefs.getBoolean("muscleEnable", true)) {
+            TableRow row = (TableRow)findViewById(R.id.tableRowMuscle);
+            row.setVisibility(View.GONE);
+        }
+
+        if(!prefs.getBoolean("waterEnable", true)) {
+            TableRow row = (TableRow)findViewById(R.id.tableRowWater);
+            row.setVisibility(View.GONE);
+        }
+
     }
 
     private boolean validateInput()
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/NewEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/NewEntryActivity.java
index bb427ddd..72ed5bdc 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/NewEntryActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/NewEntryActivity.java
@@ -27,6 +27,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
+import android.widget.TableRow;
 import android.widget.TimePicker;
 
 import com.health.openscale.R;
@@ -105,10 +106,31 @@ public class NewEntryActivity extends Activity {
             txtFat.setText(Float.toString(lastScaleData.fat));
             txtWater.setText(Float.toString(lastScaleData.water));
             txtMuscle.setText(Float.toString(lastScaleData.muscle));
+        } else {
+            txtFat.setText(Float.toString(0.0f));
+            txtWater.setText(Float.toString(0.0f));
+            txtMuscle.setText(Float.toString(0.0f));
         }
 
 		txtDate.setText(dateFormat.format(new Date()));
 		txtTime.setText(timeFormat.format(new Date()));
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+        if(!prefs.getBoolean("fatEnable", true)) {
+            TableRow row = (TableRow)findViewById(R.id.tableRowFat);
+            row.setVisibility(View.GONE);
+        }
+
+        if(!prefs.getBoolean("muscleEnable", true)) {
+            TableRow row = (TableRow)findViewById(R.id.tableRowMuscle);
+            row.setVisibility(View.GONE);
+        }
+
+        if(!prefs.getBoolean("waterEnable", true)) {
+            TableRow row = (TableRow)findViewById(R.id.tableRowWater);
+            row.setVisibility(View.GONE);
+        }
 	}
 
 	private boolean validateInput()
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 40e6c05e..8ad9223b 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
@@ -28,6 +28,7 @@ import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -157,7 +158,22 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
 
 		updateOnView(OpenScale.getInstance(overviewView.getContext()).getScaleDataList());
 
-		return overviewView;
+        if(!prefs.getBoolean("fatEnable", true)) {
+            TableRow row = (TableRow)overviewView.findViewById(R.id.tableRowFat);
+            row.setVisibility(View.GONE);
+        }
+
+        if(!prefs.getBoolean("muscleEnable", true)) {
+            TableRow row = (TableRow)overviewView.findViewById(R.id.tableRowMuscle);
+            row.setVisibility(View.GONE);
+        }
+
+        if(!prefs.getBoolean("waterEnable", true)) {
+            TableRow row = (TableRow)overviewView.findViewById(R.id.tableRowWater);
+            row.setVisibility(View.GONE);
+        }
+
+            return overviewView;
 	}
 	
 	@Override
@@ -423,9 +439,26 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
 
         List<SliceValue> arcValuesLast = new ArrayList<SliceValue>();
 
-        arcValuesLast.add(new SliceValue(lastScaleData.fat, ChartUtils.COLOR_ORANGE));
-        arcValuesLast.add(new SliceValue(lastScaleData.water, ChartUtils.COLOR_BLUE));
-        arcValuesLast.add(new SliceValue(lastScaleData.muscle, ChartUtils.COLOR_GREEN));
+        if (lastScaleData.fat == 0) {
+            arcValuesLast.add(new SliceValue(1, ChartUtils.COLOR_ORANGE));
+        }
+        else {
+            arcValuesLast.add(new SliceValue(lastScaleData.fat, ChartUtils.COLOR_ORANGE));
+        }
+
+        if (lastScaleData.water == 0) {
+            arcValuesLast.add(new SliceValue(1, ChartUtils.COLOR_BLUE));
+        }
+        else {
+            arcValuesLast.add(new SliceValue(lastScaleData.water, ChartUtils.COLOR_BLUE));
+        }
+
+        if (lastScaleData.muscle == 0) {
+            arcValuesLast.add(new SliceValue(1, ChartUtils.COLOR_GREEN));
+        }
+        else {
+            arcValuesLast.add(new SliceValue(lastScaleData.muscle, ChartUtils.COLOR_GREEN));
+        }
 
         PieChartData pieChartData = new PieChartData(arcValuesLast);
         pieChartData.setHasLabels(false);
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
index 8a20509c..bb77ef1f 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
@@ -52,7 +52,8 @@ import java.util.ArrayList;
 public class TableFragment extends Fragment implements FragmentUpdateListener {
 	private View tableView;
 	private TableLayout tableDataView;
-	
+    private SharedPreferences prefs;
+
 	public TableFragment() {
 		
 	}
@@ -91,16 +92,47 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
             btnDeleteAll.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 11);
         }
 
+        prefs = PreferenceManager.getDefaultSharedPreferences(tableView.getContext());
+
+        if(!prefs.getBoolean("fatEnable", true)) {
+            TextView txtFatTableHeader = (TextView)tableView.findViewById(R.id.txtFatTableHeader);
+            txtFatTableHeader.setVisibility(View.GONE);
+        }
+
+        if(!prefs.getBoolean("muscleEnable", true)) {
+            TextView txtMuscleTableHeader = (TextView)tableView.findViewById(R.id.txtMuscleTableHeader);
+            txtMuscleTableHeader.setVisibility(View.GONE);
+        }
+
+        if(!prefs.getBoolean("waterEnable", true)) {
+            TextView txtWaterTableHeader = (TextView)tableView.findViewById(R.id.txtWaterTableHeader);
+            txtWaterTableHeader.setVisibility(View.GONE);
+        }
+
 		return tableView;
 	}
 	
 	@Override
 	public void updateOnView(ArrayList<ScaleData> scaleDataList)
 	{
+        tableDataView.setColumnStretchable(1, true);
+        tableDataView.setColumnStretchable(2, true);
+        tableDataView.setColumnStretchable(3, true);
+        if(prefs.getBoolean("fatEnable", true)) {
+            tableDataView.setColumnStretchable(4, true);
+        }
+        if(prefs.getBoolean("waterEnable", true)) {
+            tableDataView.setColumnStretchable(5, true);
+        }
+        if(prefs.getBoolean("muscleEnable", true)) {
+            tableDataView.setColumnStretchable(6, true);
+        }
+        tableDataView.setColumnStretchable(7, true);
+
 		TableRow headerRow = (TableRow) tableView.findViewById(R.id.tableHeader);
 		tableDataView.removeAllViews();
 		tableDataView.addView(headerRow);
-		
+
 		for(ScaleData scaleData: scaleDataList)
 		{
 			TableRow dataRow = new TableRow(tableView.getContext());
@@ -134,17 +166,26 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
 			TextView fatView = new TextView(tableView.getContext());
 			fatView.setText(Float.toString(scaleData.fat));
 			fatView.setPadding(0, 5, 5, 5);
+            if(!prefs.getBoolean("fatEnable", true)) {
+                fatView.setVisibility(View.GONE);
+            }
 			dataRow.addView(fatView);
 			
 			TextView waterView = new TextView(tableView.getContext());
 			waterView.setText(Float.toString(scaleData.water));
 			waterView.setPadding(0, 5, 5, 5);
-			dataRow.addView(waterView);
+            if(!prefs.getBoolean("waterEnable", true)) {
+                waterView.setVisibility(View.GONE);
+            }
+            dataRow.addView(waterView);
 			
 			TextView muscleView = new TextView(tableView.getContext());
 			muscleView.setText(Float.toString(scaleData.muscle));
 			muscleView.setPadding(0, 5, 5, 5);
-			dataRow.addView(muscleView);
+            if(!prefs.getBoolean("muscleEnable", true)) {
+                muscleView.setVisibility(View.GONE);
+            }
+            dataRow.addView(muscleView);
 
 
             TextView commentView = new TextView(tableView.getContext());
diff --git a/android_app/app/src/main/res/layout/activity_editdata.xml b/android_app/app/src/main/res/layout/activity_editdata.xml
index 89e92b4b..5aa04b31 100644
--- a/android_app/app/src/main/res/layout/activity_editdata.xml
+++ b/android_app/app/src/main/res/layout/activity_editdata.xml
@@ -23,7 +23,7 @@
                 android:stretchColumns="2" >
 
             <TableRow
-                    android:id="@+id/tableRow1"
+                    android:id="@+id/tableRowWeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -58,7 +58,7 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/tableRow2"
+                    android:id="@+id/tableRowFat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -89,7 +89,7 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/tableRow5"
+                    android:id="@+id/tableRowWater"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -122,7 +122,7 @@
                 </TableRow>
 
             <TableRow
-                    android:id="@+id/tableRow6"
+                    android:id="@+id/tableRowMuscle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -153,7 +153,7 @@
             </TableRow>
 
             <TableRow
-                android:id="@+id/tableRow12"
+                android:id="@+id/tableRowComment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
 
diff --git a/android_app/app/src/main/res/layout/activity_newentry.xml b/android_app/app/src/main/res/layout/activity_newentry.xml
index 55c0d8b7..88a3bcff 100644
--- a/android_app/app/src/main/res/layout/activity_newentry.xml
+++ b/android_app/app/src/main/res/layout/activity_newentry.xml
@@ -23,7 +23,7 @@
                 android:stretchColumns="2" >
 
                 <TableRow
-                    android:id="@+id/tableRow1"
+                    android:id="@+id/tableRowWeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -58,7 +58,7 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/tableRow2"
+                    android:id="@+id/tableRowFat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -90,7 +90,7 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/tableRow3"
+                    android:id="@+id/tableRowWater"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -122,7 +122,7 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/tableRow4"
+                    android:id="@+id/tableRowMuscle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -154,7 +154,7 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/tableRow13"
+                    android:id="@+id/tableRowComment"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -185,7 +185,7 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/tableRow5"
+                    android:id="@+id/tableRowDate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
@@ -226,7 +226,7 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/tableRow6"
+                    android:id="@+id/tableRowTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
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 25a87320..9357c9c8 100644
--- a/android_app/app/src/main/res/layout/fragment_overview.xml
+++ b/android_app/app/src/main/res/layout/fragment_overview.xml
@@ -81,7 +81,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
-                    android:layout_marginBottom="10dp" >
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowWeight">
 
                     <ImageView
                         android:layout_width="wrap_content"
@@ -120,7 +121,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
-                    android:layout_marginBottom="10dp">
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/tableRowBMI">
 
                     <ImageView
                         android:layout_width="wrap_content"
@@ -159,7 +161,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
-                    android:id="@+id/tableRow"
+                    android:id="@+id/tableRowFat"
                     android:layout_marginBottom="10dp">
 
                     <ImageView
@@ -198,7 +200,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
-                    android:id="@+id/tableRow7"
+                    android:id="@+id/tableRowMuscle"
                     android:layout_marginBottom="10dp">
 
                     <ImageView
@@ -238,7 +240,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:orientation="horizontal"
-                    android:id="@+id/tableRow8"
+                    android:id="@+id/tableRowWater"
                     android:layout_marginBottom="10dp">
 
                     <ImageView
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 4baf0ed6..eb30dc44 100644
--- a/android_app/app/src/main/res/layout/fragment_table.xml
+++ b/android_app/app/src/main/res/layout/fragment_table.xml
@@ -18,7 +18,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:measureWithLargestChild="false"
-            android:stretchColumns="1,2,3,4,5,6,7"
             android:shrinkColumns="*">
 
             <TableRow
diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml
index 06e7858e..467b7d12 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -12,8 +12,6 @@
     <string name="error_value_range_0_300">Der Wert muss zwischen 0 und 300 liegen!</string>
     <string name="error_water_value_required">Wassergehalt ist erforderlich!</string>
     <string name="error_weight_value_required">Gewicht ist erforderlich!</string>
-    <string name="info_bluetooth_disable">ist ausgeschaltet</string>
-    <string name="info_bluetooth_enable">ist eingeschaltet</string>
     <string name="info_bluetooth_not_established">Bluetooth Verbindung konnte nicht hergestellt werden</string>
     <string name="info_data_all_deleted">Alle Datenbank Einträge wurden gelöscht!</string>
     <string name="info_data_deleted">Datenbank wurde gelöscht!</string>
@@ -50,11 +48,11 @@
     <string name="label_delete">Löschen</string>
     <string name="label_delete_all">Alles löschen</string>
     <string name="label_device_name">Gerätename</string>
-    <string name="label_enable_fat">Körperfettanteillinie</string>
+    <string name="label_enable_fat">Körperfettanteil</string>
     <string name="label_enable_labels">Notiz auf den Datenpunkten</string>
-    <string name="label_enable_muscle">Muskelanteillinie</string>
-    <string name="label_enable_water">Wassergehaltslinie</string>
-    <string name="label_enable_weight">Gewichtslinie</string>
+    <string name="label_enable_muscle">Muskelanteil</string>
+    <string name="label_enable_water">Wassergehalt</string>
+    <string name="label_enable_weight">Gewicht</string>
     <string name="label_export">Exportieren</string>
     <string name="label_fat">Körperfettanteil</string>
     <string name="label_gender">Geschlecht</string>
@@ -93,4 +91,7 @@
     <string name="title_users">Benutzer</string>
     <string name="label_add_user">Benutzer hinzufügen</string>
     <string name="error_goal_weight_required">Fehler Zielgewicht ist erforderlich!</string>
+    <string name="title_data">Daten</string>
+    <string name="info_is_not_enable">ist ausgeschaltet</string>
+    <string name="info_is_enable">ist eingeschaltet</string>
 </resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml
index c60585dd..a068df15 100644
--- a/android_app/app/src/main/res/values-ja/strings.xml
+++ b/android_app/app/src/main/res/values-ja/strings.xml
@@ -43,18 +43,16 @@
     <string name="label_measures">計測</string>
     <string name="label_title_last_measurement">最終の計測</string>
     <string name="label_goal_date_is">目標期日は</string>
-    <string name="label_enable_muscle">筋肉率線</string>
-    <string name="label_enable_water">体内の水分線</string>
-    <string name="label_enable_weight">体重線</string>
-    <string name="label_enable_fat">体脂肪線</string>
+    <string name="label_enable_muscle">筋肉率</string>
+    <string name="label_enable_water">体内の水分</string>
+    <string name="label_enable_weight">体重</string>
+    <string name="label_enable_fat">体脂肪</string>
     <string name="label_delete_all">全てデリート</string>
     <string name="label_bluetooth_enable">Bluetoothの体重計を探索する</string>
     <string name="title_edit_data_entry">エディット</string>
     <string name="label_last_month">過去30日</string>
     <string name="label_last_week">過去7日</string>
     <string name="label_device_name">デバイス名</string>
-    <string name="info_bluetooth_enable">有効にします</string>
-    <string name="info_bluetooth_disable">無効にします</string>
     <string name="error_exporting">エクスポートに失敗しました</string>
     <string name="error_importing">インポートに失敗しました</string>
     <string name="error_body_height_required">身長が必要です</string>
@@ -93,4 +91,7 @@
     <string name="question_really_delete_all">あなたは本当にすべてのレコードを削除しますか</string>
     <string name="question_really_delete_user">あなたが本当にユーザーを削除しますか</string>
     <string name="error_goal_weight_required">目標体重が必要です</string>
+    <string name="title_data">データ</string>
+    <string name="info_is_not_enable">無効にします</string>
+    <string name="info_is_enable">有効にします</string>
 </resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 98013d1f..5f9ce65c 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -8,6 +8,7 @@
     <string name="title_users">Users</string>
     <string name="title_new_data_entry">Data entry</string>
     <string name="title_edit_data_entry">Edit</string>
+    <string name="title_data">Data</string>
 
     <string name="action_settings">Settings</string>
 
@@ -81,8 +82,8 @@
     <string name="info_enter_goal_weight">Enter your goal weight in your scale unit</string>
     <string name="info_is_visible">is visible</string>
     <string name="info_is_not_visible">is not visible</string>
-    <string name="info_bluetooth_enable">is enabled</string>
-    <string name="info_bluetooth_disable">is disabled</string>
+    <string name="info_is_enable">is enabled</string>
+    <string name="info_is_not_enable">is disabled</string>
     <string name="info_delete_bluetooth_data">Clear all Bluetooth data</string>
     <string name="info_delete_bluetooth_data_success">Bluetooth data was successful cleared</string>
     <string name="info_bluetooth_not_established">Bluetooth connection not established</string>
@@ -98,10 +99,10 @@
     <string name="label_device_name">Device Name</string>
 
     <string name="label_enable_labels">Label on data point</string>
-    <string name="label_enable_weight">Weight line</string>
-    <string name="label_enable_fat">Body fat percentage line</string>
-    <string name="label_enable_water">Water percentage line</string>
-    <string name="label_enable_muscle">Muscle percentage line</string>
+    <string name="label_enable_weight">Weight </string>
+    <string name="label_enable_fat">Body fat percentage </string>
+    <string name="label_enable_water">Water percentage </string>
+    <string name="label_enable_muscle">Muscle percentage </string>
 
     <string name="info_your_weight">Your weight was</string>
     <string name="info_your_fat">Your body fat was</string>
diff --git a/android_app/app/src/main/res/xml/preferences.xml b/android_app/app/src/main/res/xml/preferences.xml
index c9dd523b..ba8f3d2f 100644
--- a/android_app/app/src/main/res/xml/preferences.xml
+++ b/android_app/app/src/main/res/xml/preferences.xml
@@ -5,17 +5,20 @@
 </PreferenceCategory>
 
 <PreferenceCategory android:title="@string/label_bluetooth_title">
-    <CheckBoxPreference android:title="@string/label_bluetooth_enable" android:summaryOn="@string/info_bluetooth_enable" android:summaryOff="@string/info_bluetooth_disable" android:key="btEnable" android:defaultValue="false"/>
+    <CheckBoxPreference android:title="@string/label_bluetooth_enable" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="btEnable" android:defaultValue="false"/>
     <EditTextPreference android:title="@string/label_device_name" android:key="btDeviceName" android:defaultValue="openScale" />
     <Preference android:title = "@string/info_delete_bluetooth_data" android:key="btClearData" />
 </PreferenceCategory>
 
 <PreferenceCategory android:title="@string/title_graph">
     <CheckBoxPreference android:title="@string/label_enable_labels" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="labelsEnable" android:defaultValue="true"/>
-    <CheckBoxPreference android:title="@string/label_enable_weight" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="weightEnable" android:defaultValue="true"/>
-    <CheckBoxPreference android:title="@string/label_enable_fat" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible"  android:key="fatEnable" android:defaultValue="true"/>
-    <CheckBoxPreference android:title="@string/label_enable_water" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible"  android:key="waterEnable" android:defaultValue="true"/>
-    <CheckBoxPreference android:title="@string/label_enable_muscle" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible"  android:key="muscleEnable" android:defaultValue="true"/>
+</PreferenceCategory>
+
+<PreferenceCategory android:title="@string/title_data">
+    <CheckBoxPreference android:title="@string/label_enable_weight" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable"  android:key="weightEnable" android:defaultValue="true"/>
+    <CheckBoxPreference android:title="@string/label_enable_fat" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="fatEnable" android:defaultValue="true"/>
+    <CheckBoxPreference android:title="@string/label_enable_water" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable"   android:key="waterEnable" android:defaultValue="true"/>
+    <CheckBoxPreference android:title="@string/label_enable_muscle" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable"  android:key="muscleEnable" android:defaultValue="true"/>
 </PreferenceCategory>
 
 </PreferenceScreen>