diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
index ef9288eb..d4e3a475 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
@@ -191,15 +191,13 @@ public class DataEntryActivity extends AppCompatActivity {
 
             final Drawable wrapped = DrawableCompat.wrap(drawable.mutate());
 
-            String menuTitle = item.getTitle().toString();
-
-            if (menuTitle == getResources().getString(R.string.save)) {
+            if (item.getItemId() == R.id.saveButton) {
                 DrawableCompat.setTint(wrapped, Color.parseColor("#FFFFFF"));
-            } else if (menuTitle == getResources().getString(R.string.edit)) {
+            } else if (item.getItemId() == R.id.editButton) {
                 DrawableCompat.setTint(wrapped, Color.parseColor("#99CC00"));
-            } else if (menuTitle == getResources().getString(R.string.toggle_expand)) {
+            } else if (item.getItemId() == R.id.expandButton) {
                 DrawableCompat.setTint(wrapped, Color.parseColor("#FFBB33"));
-            } else if (menuTitle == getResources().getString(R.string.label_delete)) {
+            } else if (item.getItemId() == R.id.deleteButton) {
                 DrawableCompat.setTint(wrapped, Color.parseColor("#FF4444"));
             }
 
@@ -267,6 +265,9 @@ public class DataEntryActivity extends AppCompatActivity {
     public void onBackPressed() {
         if (measurementViewMode == MeasurementView.MeasurementViewMode.EDIT) {
             setViewMode(MeasurementView.MeasurementViewMode.VIEW);
+            if (isDirty) {
+                scaleMeasurement = null;
+            }
             updateOnView();
         }
         else {
@@ -327,6 +328,7 @@ public class DataEntryActivity extends AppCompatActivity {
             measurement.loadFrom(scaleMeasurement, previousMeasurement);
         }
 
+        txtDataNr.setMinWidth(txtDataNr.getWidth());
         txtDataNr.setText(DateFormat.getDateTimeInstance(
                 DateFormat.LONG, DateFormat.SHORT).format(scaleMeasurement.getDateTime()));
     }
@@ -344,8 +346,8 @@ public class DataEntryActivity extends AppCompatActivity {
 
                 btnLeft.setVisibility(View.VISIBLE);
                 btnRight.setVisibility(View.VISIBLE);
-                btnLeft.setEnabled(true);
-                btnRight.setEnabled(true);
+                btnLeft.setEnabled(previousMeasurement != null);
+                btnRight.setEnabled(nextMeasurement != null);
 
                 dateTimeVisibility = View.GONE;
                 break;
diff --git a/android_app/app/src/main/res/values-ca/strings.xml b/android_app/app/src/main/res/values-ca/strings.xml
index 5b27ab53..7f430f84 100644
--- a/android_app/app/src/main/res/values-ca/strings.xml
+++ b/android_app/app/src/main/res/values-ca/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">openScale</string>
     <string name="title_overview">General</string>
     <string name="title_graph">Gràfica</string>
     <string name="title_table">Taula</string>
@@ -100,7 +99,7 @@
     <string name="info_delete_bluetooth_data">Eliminar totes les dades de Bluetooth</string>
     <string name="info_delete_bluetooth_data_success">Les dades de Bluetooth s\'han eliminat</string>
     <string name="info_bluetooth_try_connection">Intentant connectar a</string>
-    <string name="info_bluetooth_connection_lost">S\'ha perdut la connexió Bluetooth.</string>
+    <string name="info_bluetooth_connection_lost">S\'ha perdut la connexió Bluetooth</string>
     <string name="info_bluetooth_no_device">No s\'ha trobat un dispositiu Bluetooth</string>
     <string name="info_bluetooth_connection_successful">La connexió s\'ha fet correctament</string>
     <string name="info_bluetooth_init">Inicialitzar el dispositiu Bluetooth</string>
@@ -177,8 +176,8 @@
     <string name="label_goal_line">Línia de l\'objectiu</string>
 
 
-    <string name="error_max_scale_users">S\'ha assolit el nombre màxim d\'usuaris simultanis de la bàscula.</string>
-    <string name="info_step_on_scale">Si us plau, pose\'s descalç en la bàscula per prendre mesures de referència.</string>
+    <string name="error_max_scale_users">S\'ha assolit el nombre màxim d\'usuaris simultanis de la bàscula</string>
+    <string name="info_step_on_scale">Si us plau, pose\'s descalç en la bàscula per prendre mesures de referència</string>
     <string name="info_measuring">Mesura del pes: %.2f</string>
     <string name="open_drawer">obri</string>
     <string name="close_drawer">tanca</string>
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 370888cd..199d2ca4 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="app_name">openScale</string>
     <string name="action_settings">Einstellungen</string>
     <string name="error_body_height_required">Fehler Körpergröße ist erforderlich</string>
     <string name="error_exporting">Fehler beim Exportieren</string>
diff --git a/android_app/app/src/main/res/values-es/strings.xml b/android_app/app/src/main/res/values-es/strings.xml
index 66169302..368d0acd 100644
--- a/android_app/app/src/main/res/values-es/strings.xml
+++ b/android_app/app/src/main/res/values-es/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">openScale</string>
     <string name="title_overview">General</string>
     <string name="title_graph">Gráfica</string>
     <string name="title_table">Tabla</string>
@@ -177,8 +176,8 @@
     <string name="label_goal_line">Línea del objetivo</string>
 
 
-    <string name="error_max_scale_users">Número máximo de usuarios de báscula concurrentes alcanzado.</string>
-    <string name="info_step_on_scale">Por favor, póngase descalzo en la báscula para tomar medidas de referencia.</string>
+    <string name="error_max_scale_users">Número máximo de usuarios de báscula concurrentes alcanzado</string>
+    <string name="info_step_on_scale">Por favor, póngase descalzo en la báscula para tomar medidas de referencia</string>
     <string name="info_measuring">Medición de peso: %.2f</string>
 
 </resources>
diff --git a/android_app/app/src/main/res/values-fr/strings.xml b/android_app/app/src/main/res/values-fr/strings.xml
index 8988b076..2fe17d70 100644
--- a/android_app/app/src/main/res/values-fr/strings.xml
+++ b/android_app/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">openScale</string>
     <string name="title_overview">Vue d\'ensemble</string>
     <string name="title_graph">Diagramme</string>
     <string name="title_table">Tableau</string>
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 829998e8..7ebe3990 100644
--- a/android_app/app/src/main/res/values-ja/strings.xml
+++ b/android_app/app/src/main/res/values-ja/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">openScale</string>
     <string name="title_users">ユーザー</string>
     <string name="title_table">早見表</string>
     <string name="title_graph">図表</string>
diff --git a/android_app/app/src/main/res/values-nl/strings.xml b/android_app/app/src/main/res/values-nl/strings.xml
index e7ab3544..2cb976b7 100644
--- a/android_app/app/src/main/res/values-nl/strings.xml
+++ b/android_app/app/src/main/res/values-nl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">openScale</string>
     <string name="title_overview">Overzicht</string>
     <string name="title_graph">Grafieken</string>
     <string name="title_table">Tabel</string>
@@ -179,7 +178,7 @@
     <string name="label_goal_line">Doel lijn</string>
 
 
-    <string name="error_max_scale_users">Maximumaantal gelijktijdige schaalgebruikers bereikt.</string>
+    <string name="error_max_scale_users">Maximumaantal gelijktijdige schaalgebruikers bereikt</string>
     <string name="info_step_on_scale">Stapt alsjeblieft met blote voeten op de weegschaal voor een meting.</string>
     <string name="info_measuring">Gewicht meten: %.2f</string>
 
diff --git a/android_app/app/src/main/res/values-pl/strings.xml b/android_app/app/src/main/res/values-pl/strings.xml
index 6cbae2b5..0400b093 100644
--- a/android_app/app/src/main/res/values-pl/strings.xml
+++ b/android_app/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">openScale</string>
     <string name="title_overview">Przegląd</string>
     <string name="title_graph">Wykresy</string>
     <string name="title_table">Tabele</string>
diff --git a/android_app/app/src/main/res/values-pt/strings.xml b/android_app/app/src/main/res/values-pt/strings.xml
index 733f1acd..5d5382d3 100644
--- a/android_app/app/src/main/res/values-pt/strings.xml
+++ b/android_app/app/src/main/res/values-pt/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">openScale</string>
     <string name="Friday">Sexta</string>
     <string name="Monday">Segunda</string>
     <string name="Saturday">Sábado</string>
@@ -17,7 +16,7 @@
     <string name="error_hip_value_required">Erro: circunferência do quadril é obrigatória</string>
     <string name="error_importing">Erro ao importar</string>
     <string name="error_initial_weight_required">Erro: Peso inicial é obrigatório</string>
-    <string name="error_max_scale_users">Numero máximo de balanças concorrentes alcançado.</string>
+    <string name="error_max_scale_users">Numero máximo de balanças concorrentes alcançado</string>
     <string name="error_user_name_required">Erro: Nome de usuário é obrigatório</string>
     <string name="error_value_range">Valor não está no intervalo</string>
     <string name="error_value_required">Valor é obrigatório</string>
@@ -50,7 +49,7 @@
     <string name="info_on_date">em</string>
     <string name="info_no_selected_user">Nenhum usuário existe. Por favor, crie um novo usuário em Configurações.</string>
     <string name="info_set_filename">Definir nome de arquivo para</string>
-    <string name="info_step_on_scale">Por favor suba na balança para medidas de referência.</string>
+    <string name="info_step_on_scale">Por favor suba na balança para medidas de referência</string>
     <string name="info_your_fat">Sua gordura corporal foi</string>
     <string name="info_your_hip">Sua circunferência de quadril foi</string>
     <string name="info_your_muscle">Sua porcentagem de massa muscular foi</string>
diff --git a/android_app/app/src/main/res/values-sk/strings.xml b/android_app/app/src/main/res/values-sk/strings.xml
index c24f70cb..decb853b 100644
--- a/android_app/app/src/main/res/values-sk/strings.xml
+++ b/android_app/app/src/main/res/values-sk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">openScale</string>
-  <string name="title_overview">Prehľad</string>
+    <string name="title_overview">Prehľad</string>
   <string name="title_graph">Graf</string>
   <string name="title_table">Tabuľka</string>
   <string name="title_statistics">Štatistiky</string>
@@ -136,7 +135,7 @@
   <string name="label_regression_line">Vývoj úbytku hmotnosti</string>
   <string name="label_regression_line_degree">Stupeň polynomiálnej regresie</string>
   <string name="label_goal_line">Cieľová línia</string>
-  <string name="error_max_scale_users">Dosiahli ste maximálny počet viacerých používateľov.</string>
-  <string name="info_step_on_scale">Prosím, postavte sa na váhu pre referenčné meranie.</string>
+  <string name="error_max_scale_users">Dosiahli ste maximálny počet viacerých používateľov</string>
+  <string name="info_step_on_scale">Prosím, postavte sa na váhu pre referenčné meranie</string>
   <string name="info_measuring">Nameraná hmotnosť: %.2f</string>
 </resources>
diff --git a/android_app/app/src/main/res/values-sv/strings.xml b/android_app/app/src/main/res/values-sv/strings.xml
index 9e7829c6..5297edfc 100644
--- a/android_app/app/src/main/res/values-sv/strings.xml
+++ b/android_app/app/src/main/res/values-sv/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="app_name">openScale</string>
     <string name="title_overview">Översikt</string>
     <string name="title_graph">Graf</string>
     <string name="title_table">Tabell</string>
@@ -152,8 +151,8 @@
     <string name="label_regression_line">Regressionsviktlinje</string>
     <string name="label_regression_line_degree">Regressions-polynom-gradtal</string>
     <string name="label_goal_line">Mållinje</string>
-    <string name="error_max_scale_users">Maximalt antal samtidiga våganvändare har nåtts.</string>
-    <string name="info_step_on_scale">Kliv upp barfota på vågen för referensmätningar.</string>
+    <string name="error_max_scale_users">Maximalt antal samtidiga våganvändare har nåtts</string>
+    <string name="info_step_on_scale">Kliv upp barfota på vågen för referensmätningar</string>
     <string name="info_measuring">Mäter vikt: %.2f</string>
     <string name="open_drawer">öppna</string>
     <string name="close_drawer">stäng</string>
diff --git a/android_app/app/src/main/res/values-tr/strings.xml b/android_app/app/src/main/res/values-tr/strings.xml
index e3f813a4..4d4853aa 100644
--- a/android_app/app/src/main/res/values-tr/strings.xml
+++ b/android_app/app/src/main/res/values-tr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name= "app_name">openScale</string>
     <string name="title_overview">Genel Bakýþ</string>
     <string name="title_graph">Çizelge</string>
     <string name="title_table">Tablo</string>
@@ -175,7 +174,7 @@
     <string name="label_goal_line">Hedef çizgisi</string>
 
 
-    <string name="error_max_scale_users">Maksimum eþzamanlý ölçekli kullanýcý sayýsý ulaþtý.</string>
-    <string name="info_step_on_scale">Referans ölçümleri için lütfen ölçekte çýplak ayakla adým atýn.</string>
+    <string name="error_max_scale_users">Maksimum eþzamanlý ölçekli kullanýcý sayýsý ulaþtý</string>
+    <string name="info_step_on_scale">Referans ölçümleri için lütfen ölçekte çýplak ayakla adým atýn</string>
     <string name="info_measuring">Aðýrlýðý ölçme: %.2f</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 d4ca103f..ab138186 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">openScale</string>
+    <string name="app_name" translatable="false">openScale</string>
     <string name="title_overview">Overview</string>
     <string name="title_graph">Chart</string>
     <string name="title_table">Table</string>
@@ -108,7 +108,7 @@
     <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_try_connection">Trying to connect to</string>
-    <string name="info_bluetooth_connection_lost">Lost Bluetooth connection.</string>
+    <string name="info_bluetooth_connection_lost">Lost Bluetooth connection</string>
     <string name="info_bluetooth_no_device">No Bluetooth device found</string>
     <string name="info_bluetooth_no_device_set">No Bluetooth device selected</string>
     <string name="info_bluetooth_connection_successful">Connection successful established</string>
@@ -199,8 +199,8 @@
     <string name="label_feedback_message_positive">Ok, sure</string>
     <string name="label_feedback_message_negative">No, thanks</string>
 
-    <string name="error_max_scale_users">Maximum number of concurrent scale users reached.</string>
-    <string name="info_step_on_scale">Please step barefoot on the scale for reference measurements.</string>
+    <string name="error_max_scale_users">Maximum number of concurrent scale users reached</string>
+    <string name="info_step_on_scale">Please step barefoot on the scale for reference measurements</string>
     <string name="info_measuring">Measuring weight: %.2f</string>
 
     <string name="customactivityoncrash_error_activity_error_occurred_explanation">An unexpected error occurred.\n\nPlease create a new issue including the detailed error details on\nhttps://github.com/oliexdev/openScale/issues</string>