diff --git a/gui.pnproj b/gui.pnproj
index 706f4bf5..5d2af8d1 100644
--- a/gui.pnproj
+++ b/gui.pnproj
@@ -1 +1 @@
-<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="background.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_red.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_install.png"></File><File path="dialogue_box_startgame.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="nocover.png"></File><File path="nodisc.png"></File><File path="page1.png"></File><File path="page1d.png"></File><File path="page2.png"></File><File path="page2d.png"></File><File path="player1_grab.png"></File><File path="player1_point.png"></File><File path="player2_grab.png"></File><File path="player2_point.png"></File><File path="player3_grab.png"></File><File path="player3_point.png"></File><File path="player4_grab.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="tab_bg1.png"></File><File path="tab_bg2.png"></File><File path="tab_bg3.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_element.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_keyboard.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_sound.cpp"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mp3lib" path="mp3lib\"><File path="dct12.c"></File><File path="dct36.c"></File><File path="dct36_3dnow.c"></File><File path="dct36_k7.c"></File><File path="dct64.c"></File><File path="dct64_3dnow.c"></File><File path="dct64_altivec.c"></File><File path="dct64_i386.c"></File><File path="dct64_k7.c"></File><File path="dct64_mmx.c"></File><File path="dct64_sse.c"></File><File path="decod386.c"></File><File path="decode_i586.c"></File><File path="decode_mmx.c"></File><File path="equalizer.c"></File><File path="huffman.h"></File><File path="l2tables.h"></File><File path="layer1.c"></File><File path="layer2.c"></File><File path="layer3.c"></File><File path="mp3.h"></File><File path="mpg123.h"></File><File path="sr1.c"></File><File path="tabinit.c"></File><File path="test.c"></File><File path="test2.c"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File></MagicFolder><File path="apploader.c"></File><File path="apploader.h"></File><File path="audio.cpp"></File><File path="audio.h"></File><File path="cfg.c"></File><File path="cfg.h"></File><File path="data1"></File><File path="disc.c"></File><File path="disc.h"></File><File path="dns.c"></File><File path="dns.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="geckomenu.h"></File><File path="http.c"></File><File path="http.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="kenobiwii.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="mp3s.c"></File><File path="mp3s.h"></File><File path="oggplayer.c"></File><File path="oggplayer.h"></File><File path="partition.c"></File><File path="partition.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="stub.S"></File><File path="sys.c"></File><File path="sys.h"></File><File path="usbstorage.c"></File><File path="usbstorage.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="video2.c"></File><File path="video2.h"></File><File path="wbfs.c"></File><File path="wbfs.h"></File><File path="wdvd.c"></File><File path="wdvd.h"></File><File path="wpad.c"></File><File path="wpad.h"></File></MagicFolder></Project>
\ No newline at end of file
+<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="arrow_next.png"></File><File path="arrow_previous.png"></File><File path="background.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_red.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_install.png"></File><File path="dialogue_box_startgame.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="mp3_pause.png"></File><File path="mp3_stop.png"></File><File path="nocover.png"></File><File path="nodisc.png"></File><File path="page1.png"></File><File path="page1d.png"></File><File path="page2.png"></File><File path="page2d.png"></File><File path="player1_grab.png"></File><File path="player1_point.png"></File><File path="player2_grab.png"></File><File path="player2_point.png"></File><File path="player3_grab.png"></File><File path="player3_point.png"></File><File path="player4_grab.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="tab_bg1.png"></File><File path="tab_bg2.png"></File><File path="tab_bg3.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_element.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_keyboard.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_sound.cpp"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File></MagicFolder><File path="apploader.c"></File><File path="apploader.h"></File><File path="audio.cpp"></File><File path="audio.h"></File><File path="cfg.c"></File><File path="cfg.h"></File><File path="data1"></File><File path="disc.c"></File><File path="disc.h"></File><File path="dns.c"></File><File path="dns.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="geckomenu.h"></File><File path="http.c"></File><File path="http.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="kenobiwii.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="mp3s.c"></File><File path="mp3s.h"></File><File path="oggplayer.c"></File><File path="oggplayer.h"></File><File path="partition.c"></File><File path="partition.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="stub.S"></File><File path="sys.c"></File><File path="sys.h"></File><File path="usbstorage.c"></File><File path="usbstorage.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="video2.c"></File><File path="video2.h"></File><File path="wbfs.c"></File><File path="wbfs.h"></File><File path="wdvd.c"></File><File path="wdvd.h"></File><File path="wpad.c"></File><File path="wpad.h"></File></MagicFolder></Project>
\ No newline at end of file
diff --git a/gui.pnps b/gui.pnps
index adbc903b..4d76a3fe 100644
--- a/gui.pnps
+++ b/gui.pnps
@@ -1 +1 @@
-<pd><ViewState><e p="gui" x="true"></e><e p="gui\source" x="true"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\images" x="false"></e><e p="gui\source\libwbfs" x="false"></e><e p="gui\source\libwiigui" x="true"></e><e p="gui\source\mp3lib" x="false"></e><e p="gui\source\sounds" x="false"></e></ViewState></pd>
\ No newline at end of file
+<pd><ViewState><e p="gui" x="true"></e><e p="gui\source" x="true"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\images" x="false"></e><e p="gui\source\libwbfs" x="false"></e><e p="gui\source\libwiigui" x="true"></e><e p="gui\source\sounds" x="false"></e></ViewState></pd>
\ No newline at end of file
diff --git a/source/filelist.h b/source/filelist.h
index c6e7d0a4..5acd7bfa 100644
--- a/source/filelist.h
+++ b/source/filelist.h
@@ -230,13 +230,25 @@ extern const u32	player3_grab_png_size;
 extern const u8		player4_grab_png[];
 extern const u32	player4_grab_png_size;
 
+extern const u8		battery_png[];
+extern const u32	battery_png_size;
+
 extern const u8		battery_bar_png[];
 extern const u32	battery_bar_png_size;
 
 extern const u8		battery_red_png[];
 extern const u32	battery_red_png_size;
 
-extern const u8		battery_png[];
-extern const u32	battery_png_size;
+extern const u8		arrow_next_png[];
+extern const u32	arrow_next_png_size;
+
+extern const u8		arrow_previous_png[];
+extern const u32	arrow_previous_png_size;
+
+extern const u8		mp3_pause_png[];
+extern const u32	mp3_pause_png_size;
+
+extern const u8		mp3_stop_png[];
+extern const u32	mp3_stop_png_size;
 
 #endif
diff --git a/source/images/arrow_next.png b/source/images/arrow_next.png
new file mode 100644
index 00000000..4704d97b
Binary files /dev/null and b/source/images/arrow_next.png differ
diff --git a/source/images/arrow_previous.png b/source/images/arrow_previous.png
new file mode 100644
index 00000000..8dcdaddc
Binary files /dev/null and b/source/images/arrow_previous.png differ
diff --git a/source/images/mp3_pause.png b/source/images/mp3_pause.png
new file mode 100644
index 00000000..b60960fb
Binary files /dev/null and b/source/images/mp3_pause.png differ
diff --git a/source/images/mp3_stop.png b/source/images/mp3_stop.png
new file mode 100644
index 00000000..cf89d62c
Binary files /dev/null and b/source/images/mp3_stop.png differ
diff --git a/source/menu.cpp b/source/menu.cpp
index 243ee24e..78b97b76 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -4511,6 +4511,7 @@ int MenuMp3()
     int menu = MENU_NONE, cnt = 0;
     int ret = 0;
     int scrollon, i = 0;
+	char imgPath[100];
 
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 	GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
@@ -4548,32 +4549,99 @@ int MenuMp3()
 	GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
 	cancelBtn.SetScale(0.9);
 	cancelBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	cancelBtn.SetPosition(180, 400);
+	cancelBtn.SetPosition(210, 400);
 	cancelBtn.SetLabel(&cancelBtnTxt);
 	cancelBtn.SetImage(&cancelBtnImg);
 	cancelBtn.SetSoundOver(&btnSoundOver);
 	cancelBtn.SetTrigger(&trigA);
 	cancelBtn.SetEffectGrow();
 
-    GuiText playBtnTxt("Play", 22, (GXColor){0, 0, 0, 255});
-	cancelBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
-	GuiImage playBtnImg(&btnOutline);
-	if (Settings.wsprompt == yes){
-	cancelBtnImg.SetWidescreen(CFG.widescreen);}
-	GuiButton playBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
-	playBtn.SetScale(0.9);
+    bool isplaying = false;
+	int songPlaying=0;
+
+	GuiTrigger trigHome;
+	trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0);
+	GuiTrigger trigL;
+	trigL.SetButtonOnlyTrigger(-1, WPAD_BUTTON_LEFT | WPAD_CLASSIC_BUTTON_LEFT, PAD_BUTTON_LEFT);
+	GuiTrigger trigR;
+	trigR.SetButtonOnlyTrigger(-1, WPAD_BUTTON_RIGHT | WPAD_CLASSIC_BUTTON_RIGHT, PAD_BUTTON_RIGHT);
+    GuiTrigger trigMinus;
+	trigMinus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_MINUS | WPAD_CLASSIC_BUTTON_MINUS, 0);
+	GuiTrigger trigPlus;
+	trigPlus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_PLUS | WPAD_CLASSIC_BUTTON_PLUS, 0);
+
+	int playerIsUp=0;
+	snprintf(imgPath, sizeof(imgPath), "%sarrow_next.png", CFG.theme_path);
+	GuiImageData next(imgPath, arrow_next_png);
+	snprintf(imgPath, sizeof(imgPath), "%sarrow_previous.png", CFG.theme_path);
+	GuiImageData prev(imgPath, arrow_previous_png);
+	snprintf(imgPath, sizeof(imgPath), "%smp3_stop.png", CFG.theme_path);
+	GuiImageData stop(imgPath, mp3_stop_png);
+	snprintf(imgPath, sizeof(imgPath), "%smp3_pause.png", CFG.theme_path);
+	GuiImageData pause(imgPath, mp3_pause_png);
+	snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_right.png", CFG.theme_path);
+	GuiImageData play(imgPath, startgame_arrow_right_png);
+	
+	
+	
+	GuiImage nextBtnImg(&next);
+	GuiButton nextBtn(next.GetWidth(), next.GetHeight());
+	nextBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
+	nextBtn.SetPosition(100, 400);
+	nextBtn.SetImage(&nextBtnImg);
+	nextBtn.SetSoundOver(&btnSoundOver);
+	nextBtn.SetSoundClick(&btnClick);
+	nextBtn.SetTrigger(&trigA);
+	nextBtn.SetTrigger(&trigR);
+	nextBtn.SetEffectGrow();
+	
+	GuiImage prevBtnImg(&prev);
+	prevBtnImg.SetWidescreen(CFG.widescreen);
+	GuiButton prevBtn(prev.GetWidth(), prev.GetHeight());
+	prevBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
+	prevBtn.SetPosition(-100, 400);
+	prevBtn.SetImage(&prevBtnImg);
+	prevBtn.SetSoundOver(&btnSoundOver);
+	prevBtn.SetSoundClick(&btnClick);
+	prevBtn.SetTrigger(&trigA);
+	prevBtn.SetTrigger(&trigL);
+	prevBtn.SetEffectGrow();
+	
+	GuiImage playBtnImg(&play);
+	playBtnImg.SetWidescreen(CFG.widescreen);
+	GuiButton playBtn(play.GetWidth(), play.GetHeight());
 	playBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	playBtn.SetPosition(-180, 400);
-	playBtn.SetLabel(&playBtnTxt);
+	playBtn.SetPosition(42, 400);
 	playBtn.SetImage(&playBtnImg);
 	playBtn.SetSoundOver(&btnSoundOver);
+	playBtn.SetSoundClick(&btnClick);
 	playBtn.SetTrigger(&trigA);
+	playBtn.SetTrigger(&trigPlus);
 	playBtn.SetEffectGrow();
+	
+	GuiImage stopBtnImg(&stop);
+	stopBtnImg.SetWidescreen(CFG.widescreen);
+	GuiButton stopBtn(stop.GetWidth(), stop.GetHeight());
+	stopBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
+	stopBtn.SetPosition(-27, 400);
+	stopBtn.SetImage(&stopBtnImg);
+	stopBtn.SetSoundOver(&btnSoundOver);
+	stopBtn.SetSoundClick(&btnClick);
+	stopBtn.SetTrigger(&trigA);
+	stopBtn.SetTrigger(&trigMinus);
+	stopBtn.SetEffectGrow();
+	
+	GuiImage pauseBtnImg(&pause);
+	pauseBtnImg.SetWidescreen(CFG.widescreen);
 
     HaltGui();
 	GuiWindow w(screenwidth, screenheight);
     w.Append(&cancelBtn);
     w.Append(&playBtn);
+	w.Append(&playBtn);
+	w.Append(&nextBtn);
+	w.Append(&prevBtn);
+	w.Append(&stopBtn);
     mainWindow->Append(&optionBrowser4);
     mainWindow->Append(&w);
 
@@ -4595,22 +4663,59 @@ int MenuMp3()
         if(i == ret) {
             sprintf(fullpath,"%s%s", mp3path,mp3files[ret]);
             PlayMp3(fullpath);
+			songPlaying=ret;
             SetMp3Volume(127);
         }
     }
 
     if (playBtn.GetState() == STATE_CLICKED) {
-
+			StopMp3();
             ret = optionBrowser4.GetSelectedOption();
+			songPlaying=ret;
 			sprintf(fullpath,"%s%s", mp3path,mp3files[ret]);
-            //bgMusic->Stop();
             PlayMp3(fullpath);
             SetMp3Volume(127);
+			//playBtn.SetImage(&playBtnImg);isplaying=true;
+			//if (isplaying==true){playBtn.SetImage(&pauseBtnImg);isplaying=false;}
             playBtn.ResetState();
+			
     }
+	
+	if(nextBtn.GetState() == STATE_CLICKED)
+			{	
+			StopMp3();
+			songPlaying++;
+			//ret = (optionBrowser4.GetSelectedOption()+1);
+			sprintf(fullpath,"%s%s", mp3path,mp3files[songPlaying]);
+            PlayMp3(fullpath);
+            SetMp3Volume(127);
+			nextBtn.ResetState();
+				//break;
+			}
+	if(prevBtn.GetState() == STATE_CLICKED)
+			{	
+				StopMp3();
+				songPlaying--;
+				//ret = (optionBrowser4.GetSelectedOption()-1);
+				sprintf(fullpath,"%s%s", mp3path,mp3files[songPlaying]);
+				PlayMp3(fullpath);
+				SetMp3Volume(127);
+				prevBtn.ResetState();
+				//break;
+			}
+	if(stopBtn.GetState() == STATE_CLICKED)
+			{	StopMp3();
+				stopBtn.ResetState();
+				playBtn.SetImage(&playBtnImg);
+				//break;
+			}
 	}
 
 	HaltGui();
+	w.Remove(&playBtn);
+	w.Remove(&nextBtn);
+	w.Remove(&prevBtn);
+	w.Remove(&stopBtn);
 	mainWindow->Remove(&optionBrowser4);
 	mainWindow->Remove(&w);
 	ResumeGui();