diff --git a/gui.pnproj b/gui.pnproj
index 66b2d8d6..84ea5553 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="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_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
diff --git a/source/libwiigui/gui_gamegrid.cpp b/source/libwiigui/gui_gamegrid.cpp
index 29760c22..c3500028 100644
--- a/source/libwiigui/gui_gamegrid.cpp
+++ b/source/libwiigui/gui_gamegrid.cpp
@@ -31,13 +31,13 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
 	this->gameCnt = gameCnt;
 	gameList = l;
 	pagesize = 8;
+	changed = 0;
 	scrollbaron = (gameCnt > pagesize) ? 1 : 0;
 	selectable = true;
 	listOffset = (offset == 0) ? this->FindMenuItem(-1, 1) : offset;
 	selectedItem = selected - offset;
 	focus = 1; // allow focus
 	char imgPath[100];
-	tooMuch=(gameCnt-(gameCnt%8));
 
 	trigA = new GuiTrigger;
 	trigA->SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
@@ -52,16 +52,14 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
 	trigMinus->SetButtonOnlyTrigger(-1, WPAD_BUTTON_MINUS | WPAD_CLASSIC_BUTTON_MINUS, 0);
 
 	btnSoundClick = new GuiSound(button_click_pcm, button_click_pcm_size, SOUND_PCM, vol);
-	
+
 	snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_left.png", CFG.theme_path);
 	imgLeft = new GuiImageData(imgPath, startgame_arrow_left_png);
 	snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_right.png", CFG.theme_path);
 	imgRight = new GuiImageData(imgPath, startgame_arrow_right_png);
-	
+
 	btnLeftImg = new GuiImage(imgLeft);
 	btnLeft = new GuiButton(imgLeft->GetWidth(), imgLeft->GetHeight());
-	//GuiImage btnLeftImg(&imgLeft);
-	//GuiButton btnLeft(imgLeft.GetWidth(), imgLeft.GetHeight());
 	btnLeft->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 	btnLeft->SetPosition(20, -30);
 	btnLeft->SetParent(this);
@@ -74,7 +72,6 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
 
 	btnRightImg = new GuiImage(imgRight);
 	btnRight = new GuiButton(imgRight->GetWidth(), imgRight->GetHeight());
-	//GuiButton btnRight(imgRight.GetWidth(), imgRight.GetHeight());
 	btnRight->SetParent(this);
 	btnRight->SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE);
 	btnRight->SetPosition(-20, -30);
@@ -87,91 +84,55 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
 
 	gameIndex = new int[pagesize];
 	game = new GuiButton * [pagesize];
-	//gameTxt = new GuiText * [pagesize];
-	//gameBg = new GuiImage * [pagesize];
 	coverImg = new GuiImage * [pagesize];
 	cover = new GuiImageData * [pagesize];
 
-	//char buffer[THEME.maxcharacters + 4];
 	char ID[4];
 	char IDfull[7];
-	
+
 	for(int i=0; i < pagesize; i++)
 	{
-		/*if (strlen(get_title(&gameList[i])) < (u32)(THEME.maxcharacters + 3))
-		{
-			sprintf(buffer, "%s", get_title(&gameList[i]));
-		}
-		else
-		{
-			sprintf(buffer, get_title(&gameList[i]),  THEME.maxcharacters);
-			buffer[THEME.maxcharacters] = '\0';
-			strncat(buffer, "...", 3);
-		}
-		*/////////////////////////////////////////////////
-		
+
 				struct discHdr *header = &gameList[i];
 				snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]);
 				snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
-				//w.Remove(&DownloadBtn);
-
-				//load game cover
-				//if (cover)
-				//{
-				//	delete cover;
-				//	cover = NULL;
-				//}
 
 				snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, IDfull);
 				cover[i] = new GuiImageData(imgPath,0); //load short id
 				if (!cover[i]->GetImage()) //if could not load the short id image
 				{
 					delete cover[i];
+					cover[i] = NULL;
 					snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, ID);
 					cover[i] = new GuiImageData(imgPath, 0); //load full id image
 					if (!cover[i]->GetImage())
 					{
 						delete cover[i];
+						cover[i] = NULL;
 						snprintf(imgPath, sizeof(imgPath), "%snoimage.png", CFG.covers_path);
 						cover[i] = new GuiImageData(imgPath, nocover_png); //load no image
 					}
 				}
 
-				//if (coverImg)
-				//{
-				//	delete coverImg;
-				//	coverImg = NULL;
-				//}
 				coverImg[i] = new GuiImage(cover[i]);
 				coverImg[i]->SetWidescreen(CFG.widescreen);
 				coverImg[i]->SetScale(0.6);
 
-				//DownloadBtn.SetImage(coverImg);// put the new image on the download button
-				//w.Append(&DownloadBtn);
-		/////////////////////////////////////////////////
-
-		//gameTxt[i] = new GuiText(buffer, 20, (GXColor){THEME.gameText_r, THEME.gameText_g, THEME.gameText_b, 0xff});
-		//gameTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
-		//gameTxt[i]->SetPosition(24,0);
-
-		//gameBg[i] = new GuiImage(bgGamesEntry);
-
 		game[i] = new GuiButton(coverImg[i]->GetWidth()*.45,coverImg[i]->GetHeight()*.7);
 		game[i]->SetParent(this);
 		game[i]->SetAlignment(ALIGN_TOP,ALIGN_LEFT);
-		//game[i]->SetLabel(gameTxt[i]);
-		//game[i]->SetImageOver(gameBg[i]);
 		game[i]->SetImage(coverImg[i]);
 		coverImg[i]->SetParent(game[i]);
-		//coverImg[i]->SetAlignment(ALIGN_CENTRE,ALIGN_MIDDLE);
 		coverImg[i]->SetPosition(-10,-35);
-		//game[i]->SetPosition(5,GAMESELECTSIZE*i+4);
 		if (i<4)game[i]->SetPosition(117+i*110,25);
 		if (i>3)game[i]->SetPosition(117+(i-4)*110,185);
 		game[i]->SetRumble(false);
 		game[i]->SetTrigger(trigA);
 		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);
 	}
 }
@@ -179,10 +140,9 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
 /**
  * Destructor for the GuiGameGrid class.
  */
-//GuiGameGrid::~GuiGameGrid()
 GuiGameGrid::~GuiGameGrid()
 {
-  
+
 	delete imgRight;
 	delete imgLeft;
 	delete btnLeftImg;
@@ -195,14 +155,13 @@ GuiGameGrid::~GuiGameGrid()
 
 	for(int i=0; i<pagesize; i++)
 	{
-		
+
 		delete game[i];
 		delete coverImg[i];
 		delete cover[i];
 	}
 	delete [] gameIndex;
 	delete [] game;
-	//delete [] gameTxt;
 }
 
 void GuiGameGrid::SetFocus(int f)
@@ -252,7 +211,7 @@ int GuiGameGrid::GetClickedOption()
 }
 
 int GuiGameGrid::GetSelectedOption()
-{	
+{
 	int found = -1;
 	for(int i=0; i<pagesize; i++)
 	{
@@ -294,9 +253,6 @@ void GuiGameGrid::Draw()
 	if(!this->IsVisible())
 		return;
 
-	//bgGameImg->Draw();
-	
-
 	int next = listOffset;
 
 	for(int i=0; i<pagesize; i++)
@@ -322,23 +278,12 @@ void GuiGameGrid::Update(GuiTrigger * t)
 		return;
 
 	int next; //prev;
-    //static int position2;
-	u8 over=0;
-	//if (changed>gameCnt){changed=tooMuch;over=1;} 
-	
-	//int extra=(gameCnt-changed-1);
-	
-	
-	// scrolldelay affects how fast the list scrolls
-	// when the arrows are clicked
-	//float scrolldelay = 3.5;
 
-   
 	btnRight->Update(t);
 	btnLeft->Update(t);
 
 	next = listOffset;
-	//char buffer[THEME.maxcharacters + 4];
+
 	char ID[4];
 	char IDfull[7];
 	char imgPath[100];
@@ -352,21 +297,6 @@ void GuiGameGrid::Update(GuiTrigger * t)
 				game[i]->SetVisible(true);
 				game[i]->SetState(STATE_DEFAULT);
 			}
-			
-
-			/*if (strlen(get_title(&gameList[next])) < (u32)(THEME.maxcharacters + 3))
-			{
-				sprintf(buffer, "%s", get_title(&gameList[next]));
-			}
-			else
-			{
-				sprintf(buffer, get_title(&gameList[next]), THEME.maxcharacters);
-				buffer[THEME.maxcharacters] = '\0';
-				strncat(buffer, "...", 3);
-			}
-
-			gameTxt[i]->SetText(buffer);
-			gameTxt[i]->SetPosition(24, 0);*/
 
 			gameIndex[i] = next;
 			next = this->FindMenuItem(next, 1);
@@ -382,7 +312,7 @@ 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, t->chan);
+				game[selectedItem]->SetState(STATE_SELECTED);
 		}
 
 		game[i]->Update(t);
@@ -397,40 +327,38 @@ void GuiGameGrid::Update(GuiTrigger * t)
 	if(!focus)
 		return; // skip navigation
 
-    if (scrollbaron == 1) {
+	if ((t->Right()  || btnRight->GetState() == STATE_CLICKED) ) {
 
-	if ((t->Right()  ||
-	btnRight->GetState() == STATE_CLICKED) )
-	//&&(changed<(tooMuch+1)))
-	{
-		
-		////////////////////////////////////////////
 		changed += pagesize;
-		if (changed>gameCnt)changed=0;
-		
-		
-		for(int i=0; i<pagesize; i++)
-	{	
-		
-		
-		//if (changed<gameCnt){
-		//if (i<tooMuch){
-		if(coverImg[i])delete coverImg[i];
-		if(cover[i])delete cover[i];
-			struct discHdr *header = &gameList[i+changed];
-				snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]);
-				snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
-				
-				snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, IDfull);
-				cover[i] = new GuiImageData(imgPath,0); //load short id
+		if (changed>gameCnt-1)
+		changed=0;
+
+		for(int i=0; i<pagesize; i++) {
+
+		if(coverImg[i]) {
+        delete coverImg[i];
+        coverImg[i] = NULL;
+		}
+		if(cover[i]) {
+        delete cover[i];
+        cover[i] = NULL;
+		}
+            struct discHdr *header = &gameList[i+changed];
+            snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]);
+            snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
+
+            snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, IDfull);
+            cover[i] = new GuiImageData(imgPath,0); //load short id
 				if (!cover[i]->GetImage()) //if could not load the short id image
 				{
 					delete cover[i];
+					cover[i] = NULL;
 					snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, ID);
 					cover[i] = new GuiImageData(imgPath, 0); //load full id image
 					if (!cover[i]->GetImage())
 					{
 						delete cover[i];
+						cover[i] = NULL;
 						snprintf(imgPath, sizeof(imgPath), "%snoimage.png", CFG.covers_path);
 						cover[i] = new GuiImageData(imgPath, nocover_png); //load no image
 					}
@@ -440,84 +368,49 @@ void GuiGameGrid::Update(GuiTrigger * t)
 				coverImg[i]->SetWidescreen(CFG.widescreen);
 				coverImg[i]->SetScale(0.6);
 				coverImg[i]->SetParent(game[i]);
-		//coverImg[i]->SetAlignment(ALIGN_CENTRE,ALIGN_MIDDLE);
-		coverImg[i]->SetPosition(-10,-35);
+                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 ((extra<8)&&(i>extra)){
-				//if ((changed>gameCnt)){//&& (i>((changed-gameCnt)-1))){
 				if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1)))
-					coverImg[i]->SetVisible(false);//}
-					//delete coverImg[i];}
-					
-				//}
-				//else {	delete game[i];
-					//	delete coverImg[i];
-						//delete cover[i];}
-				//}
-		//usleep(500000);
-				
-				}
-
-				//game[i] = new GuiButton(coverImg[i]->GetWidth(),coverImg[i]->GetHeight());
-		//game[i]->SetParent(this);
-		//game[i]->SetImage(coverImg[i]);
-		//game[i]->SetPosition(5,GAMESELECTSIZE*i+4);
-		//game[i]->SetRumble(false);
-		//game[i]->SetTrigger(trigA);
-		//game[i]->SetSoundClick(btnSoundClick);
-	////////////////////////////////////////////////////
-		
-		
-		
-		WPAD_ScanPads();
-        u8 cnt, buttons = NULL;
-        /* Get pressed buttons */
-        for (cnt = 0; cnt < 4; cnt++)
-            buttons |= WPAD_ButtonsHeld(cnt);
-        if (buttons == WPAD_BUTTON_A) {
-
-        } else {
-            btnRight->ResetState();
-
+					game[i]->SetVisible(false);//}
         }
+    btnRight->ResetState();
 
-	}
-	else if((t->Left()  ||
-	btnLeft->GetState() == STATE_CLICKED))
-	//&& (changed>7)) ////////////////////////////////////////////up
-	//arrowUpBtn->GetState() == STATE_HELD)
-	{changed -= pagesize;if (changed<0)changed=tooMuch+pagesize;
-		over=0;
-	//if (changed<9)changed=0;
-	
-	
-	
-		
-		for(int i=0; i<pagesize; i++)
-	{	
+	} else if((t->Left()  || btnLeft->GetState() == STATE_CLICKED)){
+
+	    changed -= pagesize;
+	    if (changed < 0)
+	    changed=gameCnt-(gameCnt%8);
+
+		for(int i=0; i<pagesize; i++) {
 		coverImg[i]->SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_OUT, 65);
 
-		//usleep(500000);
-		
-		//if (changed<gameCnt){
-		if(coverImg[i])delete coverImg[i];
-		if(cover[i])delete cover[i];
-		
+		if(coverImg[i]) {
+        delete coverImg[i];
+        coverImg[i] = NULL;
+		}
+		if(cover[i]) {
+        delete cover[i];
+        cover[i] = NULL;
+		}
+
 			struct discHdr *header = &gameList[i+changed];
 				snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]);
 				snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
-				
+
 				snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, IDfull);
 				cover[i] = new GuiImageData(imgPath,0); //load short id
 				if (!cover[i]->GetImage()) //if could not load the short id image
 				{
 					delete cover[i];
+					cover[i] = NULL;
 					snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, ID);
 					cover[i] = new GuiImageData(imgPath, 0); //load full id image
 					if (!cover[i]->GetImage())
 					{
 						delete cover[i];
+						cover[i] = NULL;
 						snprintf(imgPath, sizeof(imgPath), "%snoimage.png", CFG.covers_path);
 						cover[i] = new GuiImageData(imgPath, nocover_png); //load no image
 					}
@@ -527,38 +420,17 @@ void GuiGameGrid::Update(GuiTrigger * t)
 				coverImg[i]->SetWidescreen(CFG.widescreen);
 				coverImg[i]->SetScale(0.6);
 				coverImg[i]->SetParent(game[i]);
-		//coverImg[i]->SetAlignment(ALIGN_CENTRE,ALIGN_MIDDLE);
-		coverImg[i]->SetPosition(-10,-35);
-		game[i]->ResetState();
-			game[i]->SetVisible(true);
+                coverImg[i]->SetPosition(-10,-35);
+                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)))
-					coverImg[i]->SetVisible(false);
-		//usleep(500000);
-				
+					game[i]->SetVisible(false);
 				}
-		//prev = this->FindMenuItem(gameIndex[selectedItem], -1);
-
-		//if(prev >= 0)
-		
-
-		WPAD_ScanPads();
-        u8 cnt, buttons = NULL;
-        /* Get pressed buttons */
-        for (cnt = 0; cnt < 4; cnt++)
-            buttons |= WPAD_ButtonsHeld(cnt);
-        if (buttons == WPAD_BUTTON_A) {
-
-        } else {
             btnLeft->ResetState();
-
-        }
 	}
 
-   
-
-    }
 
 	if(updateCB)
 		updateCB(this);
@@ -579,29 +451,34 @@ void GuiGameGrid::Reload(struct discHdr * l, int count)
 	char imgPath[100];
 
 	for(int i=0; i<pagesize; i++)
-		{	
+		{
 		coverImg[i]->SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_OUT, 50);
 
-		//usleep(500000);
-		
-		//if (changed<gameCnt){
-		if(coverImg[i])delete coverImg[i];
-		if(cover[i])delete cover[i];
-		
+		if(coverImg[i]) {
+        delete coverImg[i];
+        coverImg[i] = NULL;
+		}
+		if(cover[i]) {
+        delete cover[i];
+        cover[i] = NULL;
+		}
+
 			struct discHdr *header = &gameList[i+changed];
-				snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]);
-				snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
-				
-				snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, IDfull);
-				cover[i] = new GuiImageData(imgPath,0); //load short id
+            snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]);
+            snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
+
+            snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, IDfull);
+            cover[i] = new GuiImageData(imgPath,0); //load short id
 				if (!cover[i]->GetImage()) //if could not load the short id image
 				{
 					delete cover[i];
+					cover[i] = NULL;
 					snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, ID);
 					cover[i] = new GuiImageData(imgPath, 0); //load full id image
 					if (!cover[i]->GetImage())
 					{
 						delete cover[i];
+						cover[i] = NULL;
 						snprintf(imgPath, sizeof(imgPath), "%snoimage.png", CFG.covers_path);
 						cover[i] = new GuiImageData(imgPath, nocover_png); //load no image
 					}
@@ -611,15 +488,13 @@ void GuiGameGrid::Reload(struct discHdr * l, int count)
 				coverImg[i]->SetWidescreen(CFG.widescreen);
 				coverImg[i]->SetScale(0.6);
 				coverImg[i]->SetParent(game[i]);
-		//coverImg[i]->SetAlignment(ALIGN_CENTRE,ALIGN_MIDDLE);
-		coverImg[i]->SetPosition(-10,-35);
-		game[i]->ResetState();
-			game[i]->SetVisible(true);
+                coverImg[i]->SetPosition(-10,-35);
+                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)))
-					coverImg[i]->SetVisible(false);
-		//usleep(500000);
-				
+                game[i]->SetVisible(false);
+
 				game[i]->ResetState();}
 }
diff --git a/source/menu.cpp b/source/menu.cpp
index 0d8f1ed3..37acedd6 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -3011,7 +3011,7 @@ static int MenuDiscList()
 	countBtn.SetEffectGrow();
 	countBtn.SetAlpha(180);
 
-	
+
 	GuiImage gridBtnImg(&imgarrangeGrid);
 	gridBtnImg.SetWidescreen(CFG.widescreen);
 	GuiImage gridBtnImg_g(&imgarrangeGrid_gray);
@@ -3088,7 +3088,7 @@ static int MenuDiscList()
 	gameBrowser.SetPosition(THEME.selection_x, THEME.selection_y);
 	gameBrowser.SetAlignment(ALIGN_LEFT, ALIGN_CENTRE);
 
-    GuiGameGrid gameGrid(640,400, gameList, gameCnt, CFG.theme_path, bg_options_png, startat, offset);
+    GuiGameGrid gameGrid(640,400, gameList, gameCnt, CFG.theme_path, bg_options_png, 0, 0);
 	gameGrid.SetPosition(0,20);
 	gameGrid.SetAlignment(ALIGN_LEFT, ALIGN_CENTRE);
 
@@ -3362,7 +3362,7 @@ static int MenuDiscList()
 			if (Settings.gameDisplay==list){
 				gameBrowser.Reload(gameList, gameCnt);}
 			else if (Settings.gameDisplay==grid){
-				gameGrid.Reload(gameList, gameCnt);}
+            gameGrid.Reload(gameList, gameCnt);}
 			gameBrowser.Reload(gameList, gameCnt);
 			sprintf(GamesCnt,"%s: %i",LANGUAGE.Games, gameCnt);
 			gamecntTxt.SetText(GamesCnt);
@@ -3412,12 +3412,12 @@ static int MenuDiscList()
 			}
 			countBtn.ResetState();
 		}
-		
+
 		else if(gridBtn.GetState() == STATE_CLICKED)
 		{
 			if (Settings.gameDisplay==list){
 			Settings.gameDisplay=grid;
-			
+
 			mainWindow->Remove(&gameBrowser);
 			mainWindow->Append(&gameGrid);
 			if (GameIDTxt)w.Remove(GameIDTxt);
@@ -3429,19 +3429,23 @@ static int MenuDiscList()
 			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);
+			}
+
 			w.Append(&favoriteBtn);
 			w.Append(&abcBtn);
 			w.Append(&countBtn);
 			w.Append(&gridBtn);
 			w.Append(&carosselleBtn);}
-			
+
 			else if (Settings.gameDisplay==grid){
 			Settings.gameDisplay=list;
-			
+
 			mainWindow->Remove(&gameGrid);
 			mainWindow->Append(&gameBrowser);
 			gridBtn.SetImage(&gridBtnImg_g);
@@ -3450,29 +3454,32 @@ static int MenuDiscList()
 			countBtn.SetPosition(84,15);
 			gridBtn.SetPosition(116,15);
 			carosselleBtn.SetPosition(148,15);
+
+			if((Settings.hddinfo == hr12)||(Settings.hddinfo == hr24)) {
 			clockTime.SetPosition(THEME.clock_x, THEME.clock_y);
 			clockTimeBack.SetPosition(THEME.clock_x, THEME.clock_y);
 			w.Append(&clockTime);
 			w.Append(&clockTimeBack);
+			}
 			w.Append(&favoriteBtn);
 			w.Append(&abcBtn);
 			w.Append(&countBtn);
 			w.Append(&gridBtn);
 			w.Append(&carosselleBtn);}
-			
+
 			if(isSdInserted()) {
 				cfg_save_global();
-			}			
-			
+			}
+
 			//menu = MENU_DISCLIST;
 			gridBtn.ResetState();
 		}
-		
+
 		if (Settings.gameDisplay==grid){
 		int selectimg;
 		selectimg = gameGrid.GetSelectedOption();
 	    gameSelected = gameGrid.GetClickedOption();}
-		
+
 		if (Settings.gameDisplay==list) {
 		//Get selected game under cursor
 		int selectimg;//, promptnumber;
@@ -3480,8 +3487,8 @@ static int MenuDiscList()
 		char IDfull[7];
 		selectimg = gameBrowser.GetSelectedOption();
 	    gameSelected = gameBrowser.GetClickedOption();
-		
-		
+
+
 		if (gameSelected > 0) //if click occured
 			selectimg = gameSelected;