diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index e49d2df0..cef667a8 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -8,8 +8,8 @@ android {
         testApplicationId "com.health.openscale.test"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 61
-        versionName "2.4.6"
+        versionCode 62
+        versionName "2.5.0"
 
         manifestPlaceholders = [
                 appIcon: "@drawable/ic_launcher_openscale",
diff --git a/docs/screens/1_overview.png b/docs/screens/1_overview.png
index 250721a1..00ac28e4 100644
Binary files a/docs/screens/1_overview.png and b/docs/screens/1_overview.png differ
diff --git a/docs/screens/2_chart.png b/docs/screens/2_chart.png
index edfd1ee3..f642a824 100644
Binary files a/docs/screens/2_chart.png and b/docs/screens/2_chart.png differ
diff --git a/docs/screens/3_bluetooth.png b/docs/screens/3_bluetooth.png
index c98a312d..b4c20d4a 100644
Binary files a/docs/screens/3_bluetooth.png and b/docs/screens/3_bluetooth.png differ
diff --git a/docs/screens/4_table.png b/docs/screens/4_table.png
index f82dcdfa..c2e7d0ed 100644
Binary files a/docs/screens/4_table.png and b/docs/screens/4_table.png differ
diff --git a/docs/screens/5_statistics.png b/docs/screens/5_statistics.png
index 0cdd7147..11a39ddc 100644
Binary files a/docs/screens/5_statistics.png and b/docs/screens/5_statistics.png differ
diff --git a/docs/screens/6_body_metrics.png b/docs/screens/6_body_metrics.png
index af7fc9d9..5bd23d1d 100644
Binary files a/docs/screens/6_body_metrics.png and b/docs/screens/6_body_metrics.png differ
diff --git a/docs/screens/7_translations.png b/docs/screens/7_translations.png
index 6d55013d..1fd1e626 100644
Binary files a/docs/screens/7_translations.png and b/docs/screens/7_translations.png differ
diff --git a/docs/screens/8_themes.png b/docs/screens/8_themes.png
index ceef2166..b3e9a6d2 100644
Binary files a/docs/screens/8_themes.png and b/docs/screens/8_themes.png differ
diff --git a/fastlane/metadata/android/en-GB/changelogs/62.txt b/fastlane/metadata/android/en-GB/changelogs/62.txt
new file mode 100644
index 00000000..dc9bb170
--- /dev/null
+++ b/fastlane/metadata/android/en-GB/changelogs/62.txt
@@ -0,0 +1,7 @@
+- redesign overview, table and statistic fragements
+- overview shows every measurements in a recycler view
+- table has fix column and header and is vertical/horizontal scrollable
+- statistic fragment shows each measurement as a graph with average, minimum, maximum values depending on the last 7/30 days, all days, custom reference date or custom time range
+- goal can be disabled or enabled
+- support Sinocare CW286, Beurer BF915 bluetooth bathroom scale
+- fixed minor bugs
diff --git a/fastlane/metadata/android/en-GB/images/phoneScreenshots/1_en-GB.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/1_en-GB.png
index 250721a1..00ac28e4 100644
Binary files a/fastlane/metadata/android/en-GB/images/phoneScreenshots/1_en-GB.png and b/fastlane/metadata/android/en-GB/images/phoneScreenshots/1_en-GB.png differ
diff --git a/fastlane/metadata/android/en-GB/images/phoneScreenshots/2_en-GB.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/2_en-GB.png
index edfd1ee3..f642a824 100644
Binary files a/fastlane/metadata/android/en-GB/images/phoneScreenshots/2_en-GB.png and b/fastlane/metadata/android/en-GB/images/phoneScreenshots/2_en-GB.png differ
diff --git a/fastlane/metadata/android/en-GB/images/phoneScreenshots/3_en-GB.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/3_en-GB.png
index c98a312d..b4c20d4a 100644
Binary files a/fastlane/metadata/android/en-GB/images/phoneScreenshots/3_en-GB.png and b/fastlane/metadata/android/en-GB/images/phoneScreenshots/3_en-GB.png differ
diff --git a/fastlane/metadata/android/en-GB/images/phoneScreenshots/4_en-GB.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/4_en-GB.png
index f82dcdfa..c2e7d0ed 100644
Binary files a/fastlane/metadata/android/en-GB/images/phoneScreenshots/4_en-GB.png and b/fastlane/metadata/android/en-GB/images/phoneScreenshots/4_en-GB.png differ
diff --git a/fastlane/metadata/android/en-GB/images/phoneScreenshots/5_en-GB.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/5_en-GB.png
index 0cdd7147..11a39ddc 100644
Binary files a/fastlane/metadata/android/en-GB/images/phoneScreenshots/5_en-GB.png and b/fastlane/metadata/android/en-GB/images/phoneScreenshots/5_en-GB.png differ
diff --git a/fastlane/metadata/android/en-GB/images/phoneScreenshots/6_en-GB.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/6_en-GB.png
index af7fc9d9..5bd23d1d 100644
Binary files a/fastlane/metadata/android/en-GB/images/phoneScreenshots/6_en-GB.png and b/fastlane/metadata/android/en-GB/images/phoneScreenshots/6_en-GB.png differ
diff --git a/fastlane/metadata/android/en-GB/images/phoneScreenshots/7_en-GB.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/7_en-GB.png
index 6d55013d..1fd1e626 100644
Binary files a/fastlane/metadata/android/en-GB/images/phoneScreenshots/7_en-GB.png and b/fastlane/metadata/android/en-GB/images/phoneScreenshots/7_en-GB.png differ
diff --git a/fastlane/metadata/android/en-GB/images/phoneScreenshots/8_en-GB.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/8_en-GB.png
index ceef2166..b3e9a6d2 100644
Binary files a/fastlane/metadata/android/en-GB/images/phoneScreenshots/8_en-GB.png and b/fastlane/metadata/android/en-GB/images/phoneScreenshots/8_en-GB.png differ
diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/62.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/62.txt
new file mode 100644
index 00000000..dc9bb170
--- /dev/null
+++ b/fastlane/metadata/openScale_light/en-GB/changelogs/62.txt
@@ -0,0 +1,7 @@
+- redesign overview, table and statistic fragements
+- overview shows every measurements in a recycler view
+- table has fix column and header and is vertical/horizontal scrollable
+- statistic fragment shows each measurement as a graph with average, minimum, maximum values depending on the last 7/30 days, all days, custom reference date or custom time range
+- goal can be disabled or enabled
+- support Sinocare CW286, Beurer BF915 bluetooth bathroom scale
+- fixed minor bugs
diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/1_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/1_en-GB.png
index 250721a1..00ac28e4 100644
Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/1_en-GB.png and b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/1_en-GB.png differ
diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/2_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/2_en-GB.png
index edfd1ee3..f642a824 100644
Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/2_en-GB.png and b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/2_en-GB.png differ
diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/3_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/3_en-GB.png
index f82dcdfa..b4c20d4a 100644
Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/3_en-GB.png and b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/3_en-GB.png differ
diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/4_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/4_en-GB.png
index 0cdd7147..c2e7d0ed 100644
Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/4_en-GB.png and b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/4_en-GB.png differ
diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/5_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/5_en-GB.png
index af7fc9d9..11a39ddc 100644
Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/5_en-GB.png and b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/5_en-GB.png differ
diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/6_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/6_en-GB.png
index 6d55013d..5bd23d1d 100644
Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/6_en-GB.png and b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/6_en-GB.png differ
diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/7_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/7_en-GB.png
index ceef2166..1fd1e626 100644
Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/7_en-GB.png and b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/7_en-GB.png differ
diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/8_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/8_en-GB.png
new file mode 100644
index 00000000..b3e9a6d2
Binary files /dev/null and b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/8_en-GB.png differ
diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/62.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/62.txt
new file mode 100644
index 00000000..dc9bb170
--- /dev/null
+++ b/fastlane/metadata/openScale_pro/en-GB/changelogs/62.txt
@@ -0,0 +1,7 @@
+- redesign overview, table and statistic fragements
+- overview shows every measurements in a recycler view
+- table has fix column and header and is vertical/horizontal scrollable
+- statistic fragment shows each measurement as a graph with average, minimum, maximum values depending on the last 7/30 days, all days, custom reference date or custom time range
+- goal can be disabled or enabled
+- support Sinocare CW286, Beurer BF915 bluetooth bathroom scale
+- fixed minor bugs
diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/1_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/1_en-GB.png
index 250721a1..00ac28e4 100644
Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/1_en-GB.png and b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/1_en-GB.png differ
diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/2_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/2_en-GB.png
index edfd1ee3..f642a824 100644
Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/2_en-GB.png and b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/2_en-GB.png differ
diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/3_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/3_en-GB.png
index c98a312d..b4c20d4a 100644
Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/3_en-GB.png and b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/3_en-GB.png differ
diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/4_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/4_en-GB.png
index f82dcdfa..c2e7d0ed 100644
Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/4_en-GB.png and b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/4_en-GB.png differ
diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/5_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/5_en-GB.png
index 0cdd7147..11a39ddc 100644
Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/5_en-GB.png and b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/5_en-GB.png differ
diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/6_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/6_en-GB.png
index af7fc9d9..5bd23d1d 100644
Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/6_en-GB.png and b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/6_en-GB.png differ
diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/7_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/7_en-GB.png
index 6d55013d..1fd1e626 100644
Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/7_en-GB.png and b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/7_en-GB.png differ
diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/8_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/8_en-GB.png
index ceef2166..b3e9a6d2 100644
Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/8_en-GB.png and b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/8_en-GB.png differ