diff --git a/trunk/desmume/src/windows/resources.rc b/trunk/desmume/src/windows/resources.rc
index c96182044..7a440c81e 100644
--- a/trunk/desmume/src/windows/resources.rc
+++ b/trunk/desmume/src/windows/resources.rc
@@ -335,50 +335,52 @@ MENU_PRINCIPAL MENU
  }
 }
 
-IDD_CONFIG DIALOG DISCARDABLE  0, 0, 177, 161
+IDD_CONFIG DIALOG DISCARDABLE  0, 0, 125, 227
 STYLE DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
-CAPTION "Configure Controls"
+CAPTION "Configure Keys"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDC_FERMER,120,140,50,14
-    COMBOBOX        IDC_COMBO1,65,45,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    DEFPUSHBUTTON   "OK",IDC_FERMER,67,208,50,14
+    PUSHBUTTON      "Default",IDC_BUTTON1,7,208,50,14
+    COMBOBOX        IDC_COMBO1,46,13,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    LTEXT           "Key-Pad:",IDC_STATIC,10,45,28,8
-    LTEXT           "D-Pad:",IDC_STATIC,10,10,22,8
-    LTEXT           "Start:",IDC_STATIC,10,80,18,8
-    LTEXT           "L:",IDC_STATIC,120,80,8,8
-    LTEXT           "R:",IDC_STATIC,65,80,8,8
-    LTEXT           "Select:",IDC_STATIC,10,105,24,8
-    LTEXT           "Debug:",IDC_STATIC,65,104,24,8
-    PUSHBUTTON      "Default",IDC_BUTTON1,5,140,50,14
-    COMBOBOX        IDC_COMBO2,10,60,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "Up:",IDC_STATIC,17,14,27,10
+    COMBOBOX        IDC_COMBO4,46,29,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO3,120,60,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "Down:",IDC_STATIC,17,31,28,9
+    COMBOBOX        IDC_COMBO2,46,45,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO4,65,60,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "Left:",IDC_STATIC,17,47,28,9
+    COMBOBOX        IDC_COMBO3,46,61,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO5,65,10,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "Right:",IDC_STATIC,17,63,28,9
+    COMBOBOX        IDC_COMBO7,46,77,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO6,10,25,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "A:",IDC_STATIC,18,78,28,9
+    COMBOBOX        IDC_COMBO8,46,92,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO7,120,25,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "B:",IDC_STATIC,17,94,28,9
+    COMBOBOX        IDC_COMBO10,46,108,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO8,65,25,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "L:",IDC_STATIC,17,110,28,9
+    COMBOBOX        IDC_COMBO11,46,124,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO9,10,90,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "R:",IDC_STATIC,17,126,28,9
+    COMBOBOX        IDC_COMBO6,46,140,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO10,120,90,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "X:",IDC_STATIC,17,142,28,9
+    COMBOBOX        IDC_COMBO5,46,156,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO11,65,90,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "Y:",IDC_STATIC,17,158,28,9
+    GROUPBOX        "",IDC_STATIC,7,3,111,203
+    COMBOBOX        IDC_COMBO9,46,172,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO12,10,115,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "Start:",IDC_STATIC,17,174,28,9
+    COMBOBOX        IDC_COMBO12,46,188,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    COMBOBOX        IDC_COMBO13,65,114,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "",IDC_STATIC,5,0,165,135
+    LTEXT           "Select:",IDC_STATIC,17,190,28,9
 END
 
-
 IDD_MEM_VIEWER DIALOG DISCARDABLE  0, 0, 428, 178
 STYLE   WS_SYSMENU
 CAPTION "View Memory"