diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index ca4f28f..eebffa0 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -135,7 +135,7 @@ unsigned int MWHighEdgeSet;
 unsigned int MWLowEdgeSet;
 unsigned int SWHighEdgeSet;
 unsigned int SWLowEdgeSet;
-byte showSWMIBand = 1;    // Fix Me: Menu options: 0: don't show  1: show up
+byte showSWMIBand = 1;
 uint16_t SWMIBandPos;
 uint16_t SWMIBandPosold;  // Fix Me: Should store this parameter into flash, for use of restart.
 String SWMIBandstring = String();
@@ -3451,7 +3451,7 @@ void ShowRSSI() {
 }
 
 void ShowBattery() {
-  battery = map(constrain(analogRead(BATTERY_PIN), 1965, 2300), 1965, 2300, 0, 4);
+  battery = map(constrain(analogRead(BATTERY_PIN), BAT_LEVEL_EMPTY, BAT_LEVEL_FULL), BAT_LEVEL_EMPTY, BAT_LEVEL_FULL, 0, BAT_LEVEL_STAGE);
   if (batteryold != battery) {
     tft.drawRect(300, 8, 12, 20, TFT_WHITE);
     tft.fillRect(303, 4, 6, 4, TFT_WHITE);
diff --git a/src/TEF6686.h b/src/TEF6686.h
index 4062939..44ef300 100644
--- a/src/TEF6686.h
+++ b/src/TEF6686.h
@@ -19,9 +19,14 @@ enum RADIO_TUNE_MODE {
   TUNE_MAN, TUNE_AUTO, TUNE_MEM, TUNE_MI_BAND
 };
 
-#define FREQ_MW_STEP_9K     9
-#define FREQ_MW_STEP_10K    10
-#define FREQ_SW_STEP_5K     5
+#define BAT_LEVEL_EMPTY            1600
+#define BAT_LEVEL_WARN             1700
+#define BAT_LEVEL_FULL             2270
+#define BAT_LEVEL_STAGE            4
+
+#define FREQ_MW_STEP_9K            9
+#define FREQ_MW_STEP_10K           10
+#define FREQ_SW_STEP_5K            5
 
 #define FREQ_LW_LOW_EDGE_MIN       100
 #define FREQ_LW_HIGH_EDGE_MAX      519
diff --git a/src/language.h b/src/language.h
index 3ea1731..b6d5242 100644
--- a/src/language.h
+++ b/src/language.h
@@ -183,8 +183,8 @@ static const char myLanguage[9][60][78] = {
     "Proba polaczenia z Wi-Fi",
     "BLAD.. WiFi wylaczone",
     "POLACZONO!",
-	"Stationlist client IP",
-	"Show SW wavelength"
+	"IP klienta Stationlist",
+	"Pokaz dlugosci fal SW"
   },
 
   { "Hrvatski",                       // Croatian