diff --git a/source/ngc/fceuconfig.cpp b/source/ngc/fceuconfig.cpp
index 23c5c03..619f922 100644
--- a/source/ngc/fceuconfig.cpp
+++ b/source/ngc/fceuconfig.cpp
@@ -38,6 +38,8 @@ void FixInvalidSettings()
 		GCSettings.MusicVolume = 40;
 	if(!(GCSettings.SFXVolume >= 0 && GCSettings.SFXVolume <= 100))
 		GCSettings.SFXVolume = 40;
+	if(GCSettings.Controller > CTRL_PAD4 || GCSettings.Controller < CTRL_ZAPPER)
+		GCSettings.Controller = CTRL_PAD2;
 }
 
 /****************************************************************************
diff --git a/source/ngc/fceugx.h b/source/ngc/fceugx.h
index f0aaca8..893b2c7 100644
--- a/source/ngc/fceugx.h
+++ b/source/ngc/fceugx.h
@@ -13,7 +13,7 @@
 #define _FCEUGX_H_
 
 #define APPNAME			"FCE Ultra GX"
-#define APPVERSION		"2.0.9"
+#define APPVERSION		"3.0.0"
 #define PREF_FILE_NAME	"settings.xml"
 
 #define NOTSILENT 0
diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp
index 8b95ee1..b62c595 100644
--- a/source/ngc/menu.cpp
+++ b/source/ngc/menu.cpp
@@ -927,13 +927,10 @@ static void ControllerWindowUpdate(void * ptr, int dir)
 	{
 		GCSettings.Controller += dir;
 
-		if(GCSettings.Controller == CTRL_PAD) // skip
-			GCSettings.Controller += dir;
-
-		if(GCSettings.Controller > CTRL_LENGTH-1)
-			GCSettings.Controller = 0;
-		else if(GCSettings.Controller < 0)
-			GCSettings.Controller = CTRL_LENGTH-1;
+		if(GCSettings.Controller > CTRL_PAD4)
+			GCSettings.Controller = CTRL_ZAPPER;
+		else if(GCSettings.Controller < CTRL_ZAPPER)
+			GCSettings.Controller = CTRL_PAD4;
 
 		settingText->SetText(ctrlName[GCSettings.Controller]);
 		b->ResetState();
@@ -945,7 +942,7 @@ static void ControllerWindowRightClick(void * ptr) { ControllerWindowUpdate(ptr,
 
 static void ControllerWindow()
 {
-	GuiWindow * w = new GuiWindow(250,250);
+	GuiWindow * w = new GuiWindow(300,250);
 	w->SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 
 	GuiTrigger trigA;