diff --git a/gui.pnproj b/gui.pnproj
index 84ea5553..815801ea 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="abcIcon.png"></File><File path="abcIcon_gray.png"></File><File path="arrangeCarosselle.png"></File><File path="arrangeCarosselle_gray.png"></File><File path="arrangeGrid.png"></File><File path="arrangeGrid_gray.png"></File><File path="arrangeList_gray.png"></File><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_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.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="closebutton.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="exit_bottom.png"></File><File path="exit_bottom_over.png"></File><File path="exit_button.png"></File><File path="exit_top.png"></File><File path="exit_top_over.png"></File><File path="favIcon.png"></File><File path="favIcon_gray.png"></File><File path="favorite.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey_over.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="not_favorite.png"></File><File path="playCountIcon.png"></File><File path="playCountIcon_gray.png"></File><File path="player1_point.png"></File><File path="player2_point.png"></File><File path="player3_point.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.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_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.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><File path="menuin.ogg"></File><File path="menuout.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="CH2Unicode.c"></File><File path="CH2Unicode.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="fatmounter.c"></File><File path="fatmounter.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="GB2Unicode.c"></File><File path="GB2Unicode.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="language.c"></File><File path="language.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="abcIcon.png"></File><File path="abcIcon_gray.png"></File><File path="arrangeCarosselle.png"></File><File path="arrangeCarosselle_gray.png"></File><File path="arrangeGrid.png"></File><File path="arrangeGrid_gray.png"></File><File path="arrangeList.png"></File><File path="arrangeList_gray.png"></File><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_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.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="closebutton.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="downloadRev.png"></File><File path="exit_bottom.png"></File><File path="exit_bottom_over.png"></File><File path="exit_button.png"></File><File path="exit_top.png"></File><File path="exit_top_over.png"></File><File path="favIcon.png"></File><File path="favIcon_gray.png"></File><File path="favorite.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey_over.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="not_favorite.png"></File><File path="playCountIcon.png"></File><File path="playCountIcon_gray.png"></File><File path="player1_point.png"></File><File path="player2_point.png"></File><File path="player3_point.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.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_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.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><File path="menuin.ogg"></File><File path="menuout.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="CH2Unicode.c"></File><File path="CH2Unicode.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="fatmounter.c"></File><File path="fatmounter.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="GB2Unicode.c"></File><File path="GB2Unicode.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="language.c"></File><File path="language.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/source/libwiigui/gui_gamegrid.cpp b/source/libwiigui/gui_gamegrid.cpp
index c3500028..d0764cb7 100644
--- a/source/libwiigui/gui_gamegrid.cpp
+++ b/source/libwiigui/gui_gamegrid.cpp
@@ -18,9 +18,7 @@
 
 #define GAMESELECTSIZE      30
 extern const int vol;
-//int txtscroll = 0;
-int changed = 0;
-int tooMuch;
+
 /**
  * Constructor for the GuiGameGrid class.
  */
@@ -51,7 +49,8 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
 	trigMinus = new GuiTrigger;
 	trigMinus->SetButtonOnlyTrigger(-1, WPAD_BUTTON_MINUS | WPAD_CLASSIC_BUTTON_MINUS, 0);
 
-	btnSoundClick = new GuiSound(button_click_pcm, button_click_pcm_size, SOUND_PCM, vol);
+	btnSoundClick = new GuiSound(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
+	btnSoundOver = new GuiSound(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 
 	snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_left.png", CFG.theme_path);
 	imgLeft = new GuiImageData(imgPath, startgame_arrow_left_png);
@@ -65,6 +64,7 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
 	btnLeft->SetParent(this);
 	btnLeft->SetImage(btnLeftImg);
 	btnLeft->SetSoundOver(btnSoundOver);
+	btnLeft->SetSoundClick(btnSoundClick);
 	btnLeft->SetTrigger(trigA);
 	btnLeft->SetTrigger(trigL);
 	btnLeft->SetTrigger(trigMinus);
@@ -77,6 +77,7 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
 	btnRight->SetPosition(-20, -30);
 	btnRight->SetImage(btnRightImg);
 	btnRight->SetSoundOver(btnSoundOver);
+	btnRight->SetSoundClick(btnSoundClick);
 	btnRight->SetTrigger(trigA);
 	btnRight->SetTrigger(trigR);
 	btnRight->SetTrigger(trigPlus);
@@ -128,12 +129,16 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
 		if (i>3)game[i]->SetPosition(117+(i-4)*110,185);
 		game[i]->SetRumble(false);
 		game[i]->SetTrigger(trigA);
+		game[i]->SetSoundOver(btnSoundOver);
 		game[i]->SetSoundClick(btnSoundClick);
 		game[i]->SetEffectGrow();
 		game[i]->SetVisible(true);
-		if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1)))
-        game[i]->SetVisible(false);
-		coverImg[i]->SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50);
+		game[i]->SetClickable(true);
+        coverImg[i]->SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50);
+        if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) {
+            game[i]->SetVisible(false);
+            game[i]->SetClickable(false);
+        }
 	}
 }
 
@@ -297,7 +302,6 @@ void GuiGameGrid::Update(GuiTrigger * t)
 				game[i]->SetVisible(true);
 				game[i]->SetState(STATE_DEFAULT);
 			}
-
 			gameIndex[i] = next;
 			next = this->FindMenuItem(next, 1);
 		}
@@ -312,9 +316,8 @@ void GuiGameGrid::Update(GuiTrigger * t)
 			if(i != selectedItem && game[i]->GetState() == STATE_SELECTED)
 				game[i]->ResetState();
 			else if(i == selectedItem && game[i]->GetState() == STATE_DEFAULT)
-				game[selectedItem]->SetState(STATE_SELECTED);
+				game[selectedItem]->SetState(STATE_SELECTED, t->chan);
 		}
-
 		game[i]->Update(t);
 
 		if(game[i]->GetState() == STATE_SELECTED)
@@ -327,7 +330,7 @@ void GuiGameGrid::Update(GuiTrigger * t)
 	if(!focus)
 		return; // skip navigation
 
-	if ((t->Right()  || btnRight->GetState() == STATE_CLICKED) ) {
+	if ((t->Right()  || btnRight->GetState() == STATE_CLICKED)) {
 
 		changed += pagesize;
 		if (changed>gameCnt-1)
@@ -371,9 +374,12 @@ void GuiGameGrid::Update(GuiTrigger * t)
                 coverImg[i]->SetPosition(-10,-35);
 				game[i]->SetImage(coverImg[i]);
 				game[i]->SetVisible(true);
-				coverImg[i]->SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_IN, 65);
-				if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1)))
-					game[i]->SetVisible(false);//}
+				game[i]->SetClickable(true);
+				coverImg[i]->SetEffect(EFFECT_SLIDE_RIGHT | EFFECT_SLIDE_IN, 65);
+				if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) {
+					game[i]->SetVisible(false);
+					game[i]->SetClickable(false);
+				}
         }
     btnRight->ResetState();
 
@@ -424,14 +430,16 @@ void GuiGameGrid::Update(GuiTrigger * t)
                 game[i]->ResetState();
                 game[i]->SetVisible(true);
 				game[i]->SetImage(coverImg[i]);
-				coverImg[i]->SetEffect(EFFECT_SLIDE_RIGHT | EFFECT_SLIDE_IN, 65);//}
-				if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1)))
+				game[i]->SetClickable(true);
+				coverImg[i]->SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_IN, 65);
+				if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) {
 					game[i]->SetVisible(false);
+					game[i]->SetClickable(false);
 				}
+		}
             btnLeft->ResetState();
 	}
 
-
 	if(updateCB)
 		updateCB(this);
 }
@@ -442,7 +450,6 @@ void GuiGameGrid::Reload(struct discHdr * l, int count)
 	gameList = l;
 	gameCnt = count;
 	changed=0;
-	tooMuch=(gameCnt-(gameCnt%12));
 	scrollbaron = (gameCnt > pagesize) ? 1 : 0;
 	selectedItem = 0;
 	listOffset = 0;
@@ -450,9 +457,7 @@ void GuiGameGrid::Reload(struct discHdr * l, int count)
 	char IDfull[7];
 	char imgPath[100];
 
-	for(int i=0; i<pagesize; i++)
-		{
-		coverImg[i]->SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_OUT, 50);
+	for(int i=0; i<pagesize; i++) {
 
 		if(coverImg[i]) {
         delete coverImg[i];
@@ -492,9 +497,11 @@ void GuiGameGrid::Reload(struct discHdr * l, int count)
                 game[i]->ResetState();
                 game[i]->SetVisible(true);
 				game[i]->SetImage(coverImg[i]);
-				coverImg[i]->SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50);//}
-				if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1)))
-                game[i]->SetVisible(false);
-
-				game[i]->ResetState();}
+				game[i]->SetClickable(true);
+				coverImg[i]->SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50);
+				if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) {
+					game[i]->SetVisible(false);
+					game[i]->SetClickable(false);
+				}
+    }
 }
diff --git a/source/libwiigui/gui_gamegrid.h b/source/libwiigui/gui_gamegrid.h
index 74dfbc4a..7f0c337a 100644
--- a/source/libwiigui/gui_gamegrid.h
+++ b/source/libwiigui/gui_gamegrid.h
@@ -3,31 +3,6 @@
 
 #include "gui.h"
 #include "../disc.h"
-/*
-class GameBrowserList {
-	public:
-		GameBrowserList(int size) {
-			name = new char * [size];
-
-			for (int i = 0; i < size; i++)
-			{
-				name[i] = new char[50];
-			}
-			length = size;
-		};
-		~GameBrowserList(){
-			for (int i = 0; i < length; i++)
-			{
-				delete [] name[i];
-			}
-			delete [] name;
-		};
-
-	public:
-		int length;
-		char ** name;
-};
-*/
 
 class GuiGameGrid : public GuiElement
 {
@@ -49,6 +24,7 @@ class GuiGameGrid : public GuiElement
 		int listOffset;
 		int scrollbaron;
 		int pagesize;
+		int changed;
 
 		struct discHdr * gameList;
 		int gameCnt;
@@ -56,43 +32,16 @@ class GuiGameGrid : public GuiElement
 		int * gameIndex;
 		GuiButton ** game;
 		GuiText ** gameTxt;
-		//GuiImage ** gameBg;
+
 		GuiImage ** coverImg;
 		GuiImageData ** cover;
 
-		//GuiButton * arrowUpBtn;
-		//GuiButton * arrowDownBtn;
-		//GuiButton * scrollbarBoxBtn;
 		GuiButton * btnRight;
 		GuiButton * btnLeft;
 
-		//GuiImage * bgGameImg;
-		//GuiImage * scrollbarImg;
-		//GuiImage * arrowDownImg;
-		//GuiImage * arrowDownOverImg;
-		//GuiImage * ttarrowUpImg;
-		//GuiImage * ttarrowDownImg;
-		//GuiImage * arrowUpImg;
-		//GuiImage * arrowUpOverImg;
-		//GuiImage * scrollbarBoxImg;
-		//GuiImage * scrollbarBoxOverImg;
-		
 		GuiImage * btnLeftImg;
 		GuiImage * btnRightImg;
-		
-		GuiText * ttarrowDownTxt;
-		GuiText * ttarrowUpTxt;
 
-		//GuiImageData * bgGames;
-		//GuiImageData * bgGamesEntry;
-		//GuiImageData * scrollbar;
-		//GuiImageData * arrowDown;
-		//GuiImageData * arrowDownOver;
-		//GuiImageData * ttarrow;
-		//GuiImageData * arrowUp;
-		//GuiImageData * arrowUpOver;
-		//GuiImageData * scrollbarBox;
-		//GuiImageData * scrollbarBoxOver;
 		GuiImageData * imgLeft;
 		GuiImageData * imgRight;
 
diff --git a/source/menu.cpp b/source/menu.cpp
index 37acedd6..33b09dea 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -3124,7 +3124,9 @@ static int MenuDiscList()
 		w.Append(&installBtn);
 	w.Append(&homeBtn);
     w.Append(&settingsBtn);
+    if (Settings.gameDisplay==list){
 	w.Append(&DownloadBtn);
+    }
 	w.Append(&favoriteBtn);
 	w.Append(&abcBtn);
 	w.Append(&countBtn);
@@ -3411,39 +3413,36 @@ static int MenuDiscList()
 				countBtn.SetAlpha(255);
 			}
 			countBtn.ResetState();
-		}
 
-		else if(gridBtn.GetState() == STATE_CLICKED)
-		{
+		} else if(gridBtn.GetState() == STATE_CLICKED) {
 			if (Settings.gameDisplay==list){
 			Settings.gameDisplay=grid;
-
 			mainWindow->Remove(&gameBrowser);
 			mainWindow->Append(&gameGrid);
+
 			if (GameIDTxt)w.Remove(GameIDTxt);
 			if (GameRegionTxt)w.Remove(GameRegionTxt);
-			if (coverImg)w.Remove(&DownloadBtn);
+            w.Remove(&DownloadBtn);
+
 			gridBtn.SetImage(&listBtnImg_g);
 			favoriteBtn.SetPosition(-80,13);
 			abcBtn.SetPosition(-48,13);
 			countBtn.SetPosition(-16,13);
 			gridBtn.SetPosition(16,13);
 			carosselleBtn.SetPosition(48,13);
-
             if((Settings.hddinfo == hr12)||(Settings.hddinfo == hr24)) {
-			clockTime.SetPosition(THEME.clock_x, THEME.clock_y+3);
-			clockTimeBack.SetPosition(THEME.clock_x, THEME.clock_y+3);
-			w.Append(&clockTime);
-			w.Append(&clockTimeBack);
+                clockTime.SetPosition(THEME.clock_x, THEME.clock_y+3);
+                clockTimeBack.SetPosition(THEME.clock_x, THEME.clock_y+3);
+                w.Append(&clockTime);
+                w.Append(&clockTimeBack);
 			}
-
 			w.Append(&favoriteBtn);
 			w.Append(&abcBtn);
 			w.Append(&countBtn);
 			w.Append(&gridBtn);
-			w.Append(&carosselleBtn);}
+			w.Append(&carosselleBtn);
 
-			else if (Settings.gameDisplay==grid){
+			} else if (Settings.gameDisplay==grid){
 			Settings.gameDisplay=list;
 
 			mainWindow->Remove(&gameGrid);
@@ -3465,12 +3464,12 @@ static int MenuDiscList()
 			w.Append(&abcBtn);
 			w.Append(&countBtn);
 			w.Append(&gridBtn);
-			w.Append(&carosselleBtn);}
-
+			w.Append(&carosselleBtn);
+			w.Append(&DownloadBtn);
+			}
 			if(isSdInserted()) {
 				cfg_save_global();
 			}
-
 			//menu = MENU_DISCLIST;
 			gridBtn.ResetState();
 		}
@@ -3478,7 +3477,8 @@ static int MenuDiscList()
 		if (Settings.gameDisplay==grid){
 		int selectimg;
 		selectimg = gameGrid.GetSelectedOption();
-	    gameSelected = gameGrid.GetClickedOption();}
+	    gameSelected = gameGrid.GetClickedOption();
+	    }
 
 		if (Settings.gameDisplay==list) {
 		//Get selected game under cursor