--- a/Discovery/Src/tMenuEditHardware.c	Sat Apr 12 12:21:49 2025 +0200
+++ b/Discovery/Src/tMenuEditHardware.c	Fri Apr 25 08:26:03 2025 +0200
@@ -34,17 +34,10 @@
 #include "gfx_fonts.h"
 #include "ostc.h"
 #include "tCCR.h"
-#include "tMenuEdit.h"
-#include "tHome.h"
-#include "tInfo.h"
-#include "tInfoLog.h"
-#include "tInfoSensor.h"
 #include "tComm.h"
 #include "data_exchange_main.h"
 
 
-extern void tM_build_pages(void);
-
 /* Private function prototypes -----------------------------------------------*/
 void openEdit_Bluetooth(void);
 void openEdit_Compass(void);
@@ -135,25 +128,9 @@
 {
 /* does not work like this	resetEnterPressedToStateBeforeButtonAction(); */
 
-    SSettings *pSettings = settingsGetPointer();
+    bool oldValue = settingsGetPointer()->FlipDisplay;
 
-    if(pSettings->FlipDisplay == 0)
-    {
-        pSettings->FlipDisplay = 1;
-    }
-    else
-    {
-        pSettings->FlipDisplay = 0;
-    }
-    /* reinit all views */
-    tHome_init();
-    tI_init();
-    tM_init();
-    tMenuEdit_init();
-    tInfoLog_init();
-    tM_build_pages();
-    GFX_build_logo_frame();
-    GFX_build_hw_background_frame();
+    setFlipDisplay(!oldValue);
 
     exitEditWithUpdate();
     exitMenuEdit_to_Home();
@@ -172,10 +149,10 @@
             int32_t compassDeclinationDeg;
             evaluateNewString(editId, (uint32_t *)&compassDeclinationDeg, NULL, NULL, NULL);
 
-            if (compassDeclinationDeg > 99) {
-                compassDeclinationDeg = 99;
-            } else if (compassDeclinationDeg < -99) {
-                compassDeclinationDeg = -99;
+            if (compassDeclinationDeg > MAX_COMPASS_DECLINATION_DEG) {
+                compassDeclinationDeg = MAX_COMPASS_DECLINATION_DEG;
+            } else if (compassDeclinationDeg < -MAX_COMPASS_DECLINATION_DEG) {
+                compassDeclinationDeg = -MAX_COMPASS_DECLINATION_DEG;
             }
 
             settings->compassDeclinationDeg = compassDeclinationDeg;