diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index fe7c302ce..455215195 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1470,8 +1470,8 @@ zapit.scantype.tv Nur TV
 zapit.scantype.tvradio Nur TV & Radio
 zaptotimer.announce In einer Minute wird umgeschaltet.
 word.from ab
-zapitsetup.head Zapit Einstellungen
-zapitsetup.info Zapit
-zapitsetup.last_radio Start Radio Kanal
-zapitsetup.last_use Start von Letzten Kanal
-zapitsetup.last_tv Start TV Kanal
\ No newline at end of file
+zapitsetup.head  Start Kanal Einstellungen
+zapitsetup.info Start Kanal
+zapitsetup.last_radio Radio Kanal
+zapitsetup.last_use Kanal beim Runterfahren speichern
+zapitsetup.last_tv TV Kanal
\ No newline at end of file
diff --git a/data/locale/english.locale b/data/locale/english.locale
index d07ee8d45..1f000d4f1 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1471,8 +1471,8 @@ upnpbrowser.scanning Scanning for UPnP servers
 wizard.welcome_head Welcome to the Setup Wizard
 wizard.welcome_text Next steps will guide you through initial installation of the device.\nImportant: Your CoolStream set-top box can be conveniently controlled\nwith the web interface for timer management or live TV on the Web browser.\nDo not make it accessible to untrusted networks!\nDo you want to continue?
 word.from from
-zapitsetup.head Zapit Settings
-zapitsetup.info Zapit
-zapitsetup.last_radio Start Radio Channel
-zapitsetup.last_use Start from last Channel
-zapitsetup.last_tv Start TV Channel
\ No newline at end of file
+zapitsetup.head Start Channel Settings
+zapitsetup.info Start Channel
+zapitsetup.last_radio Radio Channel
+zapitsetup.last_use from last Channel
+zapitsetup.last_tv TV Channel
\ No newline at end of file
diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp
index 34ffeac98..31610a20c 100644
--- a/src/gui/zapit_setup.cpp
+++ b/src/gui/zapit_setup.cpp
@@ -147,11 +147,13 @@ int CSelectChannelWidget::exec(CMenuTarget* parent, const std::string& actionKey
 extern CBouquetManager *g_bouquetManager;
 void CSelectChannelWidget::InitZapitChannelHelper(CZapitClient::channelsMode mode)
 {
+	std::vector<CMenuWidget *> toDelete;
 	CMenuWidget mctv(LOCALE_TIMERLIST_BOUQUETSELECT, NEUTRINO_ICON_SETTINGS, width, height);
 	mctv.addIntroItems();
 
 	for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++) {
 		CMenuWidget* mwtv = new CMenuWidget(LOCALE_TIMERLIST_CHANNELSELECT, NEUTRINO_ICON_SETTINGS, width, height);
+		toDelete.push_back(mwtv);
 		mwtv->addIntroItems();
 		ZapitChannelList channels = (mode == CZapitClient::MODE_RADIO) ? g_bouquetManager->Bouquets[i]->radioChannels : g_bouquetManager->Bouquets[i]->tvChannels;
 		for(int j = 0; j < (int) channels.size(); j++) {
@@ -171,4 +173,11 @@ void CSelectChannelWidget::InitZapitChannelHelper(CZapitClient::channelsMode mod
 	}
 	mctv.exec (NULL, "");
 	mctv.hide ();
+
+	// delete dynamic created objects
+	for(unsigned int count=0;count<toDelete.size();count++)
+	{
+		delete toDelete[count];
+	}
+	toDelete.clear();
 }
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 307b53019..e960afb28 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -803,9 +803,10 @@ void CNeutrinoApp::InitServiceSettings(CMenuWidget &service, CMenuWidget &_scanS
 	// service.addItem(new CMenuForwarder(LOCALE_EXTRA_ZAPIT_MENU      , true, NULL, zapit_menu, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
 	service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD    , true, NULL, this, "reloadchannels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN ));
 	service.addItem(new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME    , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW ));
+	service.addItem(new CMenuForwarder(LOCALE_ZAPITSETUP_HEAD, true, NULL, new CZapitSetup() , NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE ));
 
 	CDataResetNotifier * resetNotifier = new CDataResetNotifier();
-	service.addItem(new CMenuForwarder(LOCALE_RESET_CHANNELS    , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE ));
+	service.addItem(new CMenuForwarder(LOCALE_RESET_CHANNELS    , true, NULL, resetNotifier, "channels", CRCInput::RC_1));
 
 	service.addItem(GenericMenuSeparatorLine);
 	service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RESTART   , true, NULL, this, "restart", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER));
@@ -1031,7 +1032,6 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings)
 	miscSettingsFilebrowser->addItem(new CMenuOptionChooser(LOCALE_FILEBROWSER_DENYDIRECTORYLEAVE, &g_settings.filebrowser_denydirectoryleave, MESSAGEBOX_NO_YES_OPTIONS              , MESSAGEBOX_NO_YES_OPTION_COUNT              , true ));
 	miscSettings.addItem( new CMenuForwarder(LOCALE_FILEBROWSER_HEAD, true, NULL, miscSettingsFilebrowser, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE) );
 	miscSettings.addItem(new CMenuForwarder(LOCALE_VIDEOMENU_HDMI_CEC, true, NULL, new CCECSetup() , NULL, CRCInput::RC_0));
-	miscSettings.addItem(new CMenuForwarder(LOCALE_ZAPITSETUP_HEAD, true, NULL, new CZapitSetup() , NULL, CRCInput::RC_1));
 
 #if 0
 	//infobar