diff --git a/po/ca_ES.po b/po/ca_ES.po
index 2a6c3d0..ce76d92 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 15:29+0200\n"
+"POT-Creation-Date: 2022-04-29 15:32+0200\n"
 "PO-Revision-Date: 2013-09-21 17:49+0200\n"
 "Last-Translator: My friend <Sampep> Thanks David <Gabychan> <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -498,8 +498,8 @@ msgstr "No s'ha trobat la cadena de text"
 msgid "Configure Options for Switchtimer"
 msgstr "Opcions de configuració de canvi de temporitzador"
 
-msgid "Minutes before switching"
-msgstr "Minuts abans del canvi"
+msgid "Create"
+msgstr "Crea"
 
 msgid "switch"
 msgstr "canvia"
@@ -510,12 +510,12 @@ msgstr "només anunci"
 msgid "ask for switch"
 msgstr "pregunta pel canvi"
 
+msgid "Minutes before switching"
+msgstr "Minuts abans del canvi"
+
 msgid "Switch Mode"
 msgstr "Mode de canvi"
 
-msgid "Create"
-msgstr "Crea"
-
 msgid "Switch Timer sucessfully created"
 msgstr "Canvi de temporitzador creat"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 94c29b4..2e28f14 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 15:29+0200\n"
+"POT-Creation-Date: 2022-04-29 15:32+0200\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: Horst\n"
 "Language-Team: \n"
@@ -495,8 +495,8 @@ msgstr "Keine Treffer für Suchbegriff"
 msgid "Configure Options for Switchtimer"
 msgstr "Optionen für Umschalttimer konfigurieren"
 
-msgid "Minutes before switching"
-msgstr "Minuten vor umschalten"
+msgid "Create"
+msgstr "Anlegen"
 
 msgid "switch"
 msgstr "umschalten"
@@ -507,12 +507,12 @@ msgstr "nur ankündigen"
 msgid "ask for switch"
 msgstr "vor umschalten fragen"
 
+msgid "Minutes before switching"
+msgstr "Minuten vor umschalten"
+
 msgid "Switch Mode"
 msgstr "Umschaltmodus"
 
-msgid "Create"
-msgstr "Anlegen"
-
 msgid "Switch Timer sucessfully created"
 msgstr "Umschalttimer erfolgreich angelegt"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index f2a3a74..c41c967 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 15:29+0200\n"
+"POT-Creation-Date: 2022-04-29 15:32+0200\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: fiveten_59\n"
 "Language-Team: \n"
@@ -495,8 +495,8 @@ msgstr "Keine Treffer für Suchbegriff"
 msgid "Configure Options for Switchtimer"
 msgstr "Optionen für Umschalttimer konfigurieren"
 
-msgid "Minutes before switching"
-msgstr "Minuten vor umschalten"
+msgid "Create"
+msgstr "Creare"
 
 msgid "switch"
 msgstr "cambio"
@@ -507,12 +507,12 @@ msgstr "Segnala solamente"
 msgid "ask for switch"
 msgstr "chiedi per cambiare"
 
+msgid "Minutes before switching"
+msgstr "Minuten vor umschalten"
+
 msgid "Switch Mode"
 msgstr "Modalità Switch"
 
-msgid "Create"
-msgstr "Creare"
-
 msgid "Switch Timer sucessfully created"
 msgstr "Switch Timer creato con successo"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index fa65800..3059aa0 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.0.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 15:29+0200\n"
+"POT-Creation-Date: 2022-04-29 15:32+0200\n"
 "PO-Revision-Date: 2013-09-25 17:49+0400\n"
 "Last-Translator: AmiD, ilya\n"
 "Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n"
@@ -495,8 +495,8 @@ msgstr "Совпадений НЕ найдено"
 msgid "Configure Options for Switchtimer"
 msgstr "Настройка таймера переключения"
 
-msgid "Minutes before switching"
-msgstr "Минут до события"
+msgid "Create"
+msgstr "Создать"
 
 msgid "switch"
 msgstr "Переключить"
@@ -507,12 +507,12 @@ msgstr "Только предупредить"
 msgid "ask for switch"
 msgstr "Спросить о переключении"
 
+msgid "Minutes before switching"
+msgstr "Минут до события"
+
 msgid "Switch Mode"
 msgstr "Режим переключения"
 
-msgid "Create"
-msgstr "Создать"
-
 msgid "Switch Timer sucessfully created"
 msgstr "Таймер переключения создан"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index f566f3e..21be423 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 15:29+0200\n"
+"POT-Creation-Date: 2022-04-29 15:32+0200\n"
 "PO-Revision-Date: 2013-09-15 00:12+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -495,8 +495,8 @@ msgstr "H
 msgid "Configure Options for Switchtimer"
 msgstr "Konfigurova� mo�nosti pre prep�nac� pl�n"
 
-msgid "Minutes before switching"
-msgstr "Min�ty pred prepnut�m"
+msgid "Create"
+msgstr "Vytvori�"
 
 msgid "switch"
 msgstr "Prepn��"
@@ -507,12 +507,12 @@ msgstr "iba ozn
 msgid "ask for switch"
 msgstr "op�ta� sa na prepnutie"
 
+msgid "Minutes before switching"
+msgstr "Min�ty pred prepnut�m"
+
 msgid "Switch Mode"
 msgstr "Prep�nac� re�im"
 
-msgid "Create"
-msgstr "Vytvori�"
-
 msgid "Switch Timer sucessfully created"
 msgstr "Prepnutie je napl�novan�"
 
diff --git a/recmenus.c b/recmenus.c
index 35aed8f..9e69115 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -1089,26 +1089,23 @@ cRecMenuSearchTimerNothingFound::cRecMenuSearchTimerNothingFound(std::string sea
 ******************************************************************************************/
 
 // --- cRecMenuSwitchTimer  ---------------------------------------------------------
-cRecMenuSwitchTimer::cRecMenuSwitchTimer(void) {
+cRecMenuSwitchTimer::cRecMenuSwitchTimer(void) { // OK
+    SetWidthPercent(60);
+
     switchMinsBefore = config.switchMinsBefore;
     switchMode = config.switchMode;
 
-    SetWidthPercent(60);
-    
-    cString infoText = tr("Configure Options for Switchtimer");
-    cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
-    infoItem->CalculateHeight(width - 2 * border);
-    AddMenuItem(infoItem);
+    AddHeader(new cRecMenuItemInfo(tr("Configure Options for Switchtimer"), 1, "", "", "", width - 2 * border, true));
+    AddFooter(new cRecMenuItemButtonYesNo(tr("Create"), tr("Cancel"), rmsSwitchTimerCreate, rmsClose, true));
 
-    AddMenuItem(new cRecMenuItemInt(tr("Minutes before switching"), 0, 10, false, &switchMinsBefore));
     std::vector<std::string> switchModeItems;
     switchModeItems.push_back(tr("switch"));
     switchModeItems.push_back(tr("announce only"));
     switchModeItems.push_back(tr("ask for switch"));
+
+    AddMenuItem(new cRecMenuItemInt(tr("Minutes before switching"), 0, 10, false, &switchMinsBefore));
     AddMenuItem(new cRecMenuItemSelect(tr("Switch Mode"), switchModeItems, false, &switchMode));
-    
-    AddMenuItem(new cRecMenuItemButtonYesNo(tr("Create"), tr("Cancel"), rmsSwitchTimerCreate, rmsClose, true));
-    
+
     CalculateHeight();
     CreatePixmap();
     Arrange();