diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp
index 3f4154ad11..02caa9f5f6 100644
--- a/GPU/GLES/DisplayListInterpreter.cpp
+++ b/GPU/GLES/DisplayListInterpreter.cpp
@@ -78,7 +78,7 @@ void GLES_GPU::InitClear()
 		//	glClearColor(1,0,1,1);
 		glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
 	}
-	glViewport(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
+	glViewport(0, 0, 480 * g_Config.iWindowZoom , 272 * g_Config.iWindowZoom );
 }
 
 void GLES_GPU::BeginFrame()
@@ -118,7 +118,7 @@ void GLES_GPU::CopyDisplayToOutput()
 	VirtualFramebuffer *vfb = GetDisplayFBO();
 	fbo_unbind();
 
-	glViewport(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
+	glViewport(0, 0, 480 * g_Config.iWindowZoom , 272 * g_Config.iWindowZoom );
 
 	currentRenderVfb_ = 0;
 
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index d3c0c6b5d7..eab8d124d4 100644
--- a/Windows/ppsspp.rc
+++ b/Windows/ppsspp.rc
@@ -196,14 +196,14 @@ BEGIN
         MENUITEM "R&eset",                      ID_EMULATION_RESET
         MENUITEM SEPARATOR
         MENUITEM "&Interpreter",                ID_CPU_INTERPRETER
-        MENUITEM "&Slightly faster interpreter", ID_CPU_FASTINTERPRETER
+        MENUITEM "&Slightly Faster Interpreter", ID_CPU_FASTINTERPRETER
         MENUITEM "&Dynarec",                    ID_CPU_DYNAREC, CHECKED
     END
     POPUP "Debu&g"
     BEGIN
         MENUITEM "Load &Map File...",           ID_DEBUG_LOADMAPFILE
         MENUITEM "&Save Map File...",           ID_DEBUG_SAVEMAPFILE
-        MENUITEM "&Reset symbol table",         ID_DEBUG_RESETSYMBOLTABLE
+        MENUITEM "&Reset Symbol Table",         ID_DEBUG_RESETSYMBOLTABLE
         MENUITEM SEPARATOR
         MENUITEM "&Disassembly\tCtrl+D",        ID_DEBUG_DISASSEMBLY
         MENUITEM "&Log Console\tCtrl+L",        ID_DEBUG_LOG
@@ -212,14 +212,14 @@ BEGIN
     POPUP "&Options"
     BEGIN
         MENUITEM "&Toggle Full Screen\tF12",    ID_OPTIONS_FULLSCREEN
-        MENUITEM "&Display raw framebuffer",    ID_OPTIONS_DISPLAYRAWFRAMEBUFFER
-        MENUITEM "&Buffered rendering",         ID_OPTIONS_BUFFEREDRENDERING
-        MENUITEM "&Show debug statistics",      ID_OPTIONS_SHOWDEBUGSTATISTICS
+        MENUITEM "&Display Raw Framebuffer",    ID_OPTIONS_DISPLAYRAWFRAMEBUFFER
+        MENUITEM "&Buffered Rendering\tF5",         ID_OPTIONS_BUFFEREDRENDERING
+        MENUITEM "&Show Debug Statistics",      ID_OPTIONS_SHOWDEBUGSTATISTICS
         MENUITEM SEPARATOR
-        MENUITEM "Screen &1x",                  ID_OPTIONS_SCREEN1X
-        MENUITEM "Screen &2x",                  ID_OPTIONS_SCREEN2X
-        MENUITEM "Screen &3x",                  ID_OPTIONS_SCREEN3X
-        MENUITEM "Screen &4x",                  ID_OPTIONS_SCREEN4X
+        MENUITEM "Screen &1x\tCtrl+1",                  ID_OPTIONS_SCREEN1X
+        MENUITEM "Screen &2x\tCtrl+2",                  ID_OPTIONS_SCREEN2X
+        MENUITEM "Screen &3x\tCtrl+3",                  ID_OPTIONS_SCREEN3X
+        MENUITEM "Screen &4x\tCtrl+4",                  ID_OPTIONS_SCREEN4X
         MENUITEM SEPARATOR
         MENUITEM "&Ignore illegal reads/writes", ID_OPTIONS_IGNOREILLEGALREADS
     END
@@ -313,9 +313,14 @@ BEGIN
     "R",            ID_DEBUG_REGISTERS,     VIRTKEY, CONTROL, NOINVERT
     VK_F8,          ID_EMULATION_PAUSE,     VIRTKEY, NOINVERT
     VK_F7,          ID_EMULATION_RUN,       VIRTKEY, NOINVERT
-    VK_F4,          ID_FILE_LOADSTATE,      VIRTKEY, NOINVERT
-    VK_F5,          ID_FILE_REFRESHGAMELIST, VIRTKEY, NOINVERT
-    VK_F2,          ID_FILE_SAVESTATE,      VIRTKEY, NOINVERT
+    //VK_F4,          ID_FILE_LOADSTATE,      VIRTKEY, NOINVERT
+    //VK_F5,          ID_FILE_REFRESHGAMELIST, VIRTKEY, NOINVERT
+    //VK_F2,          ID_FILE_SAVESTATE,      VIRTKEY, NOINVERT
+    "1",          ID_OPTIONS_SCREEN1X,       VIRTKEY, CONTROL, NOINVERT
+    "2",          ID_OPTIONS_SCREEN2X,       VIRTKEY, CONTROL, NOINVERT
+    "3",          ID_OPTIONS_SCREEN3X,       VIRTKEY, CONTROL, NOINVERT
+    "4",          ID_OPTIONS_SCREEN4X,       VIRTKEY, CONTROL, NOINVERT
+    VK_F5,          ID_OPTIONS_BUFFEREDRENDERING,       VIRTKEY, NOINVERT
     "W",            ID_FILE_UNLOAD,         VIRTKEY, CONTROL, NOINVERT
     VK_F12,         ID_OPTIONS_FULLSCREEN,  VIRTKEY, NOINVERT
 END