diff --git a/Source/Project64/UserInterface/UIResources.rc b/Source/Project64/UserInterface/UIResources.rc
index 6afb0d289..be7de733e 100644
--- a/Source/Project64/UserInterface/UIResources.rc
+++ b/Source/Project64/UserInterface/UIResources.rc
@@ -82,8 +82,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     COMBOBOX        GFX_LIST,7,18,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "About",GFX_ABOUT,166,18,44,13,WS_DISABLED
-    COMBOBOX        AUDIO_LIST,7,48,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "About",AUDIO_ABOUT,166,48,44,13,WS_DISABLED
+    COMBOBOX        AUDIO_LIST,7,47,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "About",AUDIO_ABOUT,166,47,44,13,WS_DISABLED
     COMBOBOX        CONT_LIST,7,76,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "About",CONT_ABOUT,166,76,44,13,WS_DISABLED
     COMBOBOX        RSP_LIST,7,105,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
@@ -91,7 +91,7 @@ BEGIN
     CONTROL         "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,127,193,10
     CONTROL         "Use High Level Audio",IDC_HLE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,140,188,10
     GROUPBOX        "Graphics:",IDC_GFX_NAME,6,6,208,29
-    GROUPBOX        "Audio:",IDC_AUDIO_NAME,6,38,208,29
+    GROUPBOX        "Audio:",IDC_AUDIO_NAME,6,37,208,29
     GROUPBOX        "Controller:",IDC_CONT_NAME,6,66,208,29
     GROUPBOX        "Reality Signal Processor: ",IDC_RSP_NAME,6,96,208,29
 END
@@ -141,8 +141,8 @@ BEGIN
     PUSHBUTTON      "Add ->",IDC_ADD,85,38,45,12
     PUSHBUTTON      "<- Remove",IDC_REMOVE,85,54,45,12
     LISTBOX         IDC_USING,134,38,76,87,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Up",IDC_UP,134,131,34,11
-    PUSHBUTTON      "Down",IDC_DOWN,175,131,34,11
+    PUSHBUTTON      "Up",IDC_UP,134,131,34,12
+    PUSHBUTTON      "Down",IDC_DOWN,175,131,34,12
     CONTROL         "Use Directory recursion",IDC_RECURSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,148,202,10
     CONTROL         "Show File extensions",IDC_SHOW_FILE_EXTENSIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,159,202,10
 END
@@ -163,10 +163,10 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,4,84,208,1
     LTEXT           "Max # of Roms Remembered (Max 10):",IDC_MAXROMS_TXT,6,92,142,10,SS_ENDELLIPSIS
     EDITTEXT        IDC_REMEMBER,148,90,26,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "roms",IDC_ROMSEL_TEXT2,178,93,31,10
+    LTEXT           "roms",IDC_ROMSEL_TEXT2,178,92,31,10
     LTEXT           "Max # of Rom Dirs Remembered (Max 10):",IDC_MAXROMDIR_TXT,6,107,142,10,SS_ENDELLIPSIS
     EDITTEXT        IDC_REMEMBERDIR,148,105,26,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "dirs",IDC_ROMSEL_TEXT4,178,109,34,10
+    LTEXT           "dirs",IDC_ROMSEL_TEXT4,178,107,34,10
 END
 
 IDD_Rom_Information DIALOGEX 0, 0, 239, 207
@@ -177,26 +177,26 @@ BEGIN
     DEFPUSHBUTTON   "&Close",IDC_CLOSE_BUTTON,169,186,64,14
     GROUPBOX        "",IDC_STATIC,6,5,228,177
     LTEXT           "ROM Name:",IDC_ROM_NAME,11,16,64,10
-    EDITTEXT        IDC_INFO_ROMNAME,77,15,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    EDITTEXT        IDC_INFO_ROMNAME,77,14,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
     LTEXT           "File Name:",IDC_FILE_NAME,11,31,64,10
-    EDITTEXT        IDC_INFO_FILENAME,77,30,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    LTEXT           "Rom Size:",IDC_ROM_SIZE,11,74,64,10
+    EDITTEXT        IDC_INFO_FILENAME,77,29,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    LTEXT           "Rom Size:",IDC_ROM_SIZE,11,76,64,10
     EDITTEXT        IDC_INFO_ROMSIZE,77,74,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    LTEXT           "Cartridge ID:",IDC_CART_ID,11,90,64,10
+    LTEXT           "Cartridge ID:",IDC_CART_ID,11,91,64,10
     EDITTEXT        IDC_INFO_CARTID,77,89,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
     LTEXT           "Media:",IDC_MEDIA,11,106,64,10
     EDITTEXT        IDC_INFO_MEDIA,77,104,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    LTEXT           "Country:",IDC_COUNTRY,11,122,64,10
+    LTEXT           "Country:",IDC_COUNTRY,11,121,64,10
     EDITTEXT        IDC_INFO_COUNTRY,77,119,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    LTEXT           "CRC1:",IDC_CRC1,11,135,64,10
+    LTEXT           "CRC1:",IDC_CRC1,11,136,64,10
     EDITTEXT        IDC_INFO_CRC1,77,134,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
     LTEXT           "CRC2:",IDC_CRC2,11,151,64,10
     EDITTEXT        IDC_INFO_CRC2,77,149,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    LTEXT           "CIC Chip:",IDC_CIC_CHIP,11,167,64,10
+    LTEXT           "CIC Chip:",IDC_CIC_CHIP,11,166,64,10
     EDITTEXT        IDC_INFO_CIC,77,164,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    LTEXT           "Location:",IDC_LOCATION,11,45,64,10
-    EDITTEXT        IDC_INFO_LOCATION,77,45,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    LTEXT           "MD5:",IDC_ROM_MD5,11,60,64,10
+    LTEXT           "Location:",IDC_LOCATION,11,46,64,10
+    EDITTEXT        IDC_INFO_LOCATION,77,44,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    LTEXT           "MD5:",IDC_ROM_MD5,11,61,64,10
     EDITTEXT        IDC_INFO_MD5,77,59,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
 END
 
@@ -205,14 +205,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Good Name:",IDC_GOOD_NAME_TEXT,6,8,91,10
+    LTEXT           "Good Name:",IDC_GOOD_NAME_TEXT,6,9,91,10
     EDITTEXT        IDC_GOOD_NAME,102,7,109,12,ES_AUTOHSCROLL | ES_READONLY
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,4,25,208,1
     LTEXT           "Memory Size:",IDC_MEMORY_SIZE_TEXT,6,34,91,10
     COMBOBOX        IDC_RDRAM_SIZE,102,32,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Default Save type:",IDC_SAVE_TYPE_TEXT,6,49,91,10
     COMBOBOX        IDC_SAVE_TYPE,102,47,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Counter Factor:",IDC_COUNTFACT_TEXT,6,64,91,10
+    LTEXT           "Counter Factor:",IDC_COUNTFACT_TEXT,6,63,91,10
     COMBOBOX        IDC_COUNTFACT,102,61,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Vi Refresh Rate:",IDC_VIREFESH_TEXT,6,77,91,10
     EDITTEXT        IDC_VIREFRESH,102,75,109,12,ES_AUTOHSCROLL | ES_NUMBER
@@ -227,8 +227,8 @@ BEGIN
     CONTROL         "Delay SI Interrupt",IDC_DELAY_SI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,132,91,10
     CONTROL         "RSP Audio Signal",IDC_AUDIO_SIGNAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,143,91,10
     CONTROL         "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,143,107,10
-    CONTROL         "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,154,91,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,143,115,10
+    CONTROL         "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,154,91,10
 END
 
 IDD_Settings_Accelerator DIALOGEX 0, 0, 218, 183
@@ -295,7 +295,7 @@ BEGIN
     LTEXT           "<value> <label>",IDC_LABEL_OPTIONS_FORMAT,101,42,80,10,WS_DISABLED
     EDITTEXT        IDC_CHEAT_CODES,4,52,88,96,ES_MULTILINE | ES_UPPERCASE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
     EDITTEXT        IDC_CHEAT_OPTIONS,100,52,98,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_DISABLED | WS_VSCROLL | WS_HSCROLL
-    LTEXT           "Cheat Notes",IDC_CHEATNOTES,3,149,60,10
+    LTEXT           "Cheat Notes",IDC_CHEATNOTES,3,150,60,10
     EDITTEXT        IDC_NOTES,4,160,194,32,ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL
     PUSHBUTTON      "New Cheat",IDC_NEWCHEAT,23,198,75,15
     PUSHBUTTON      "Add Cheat",IDC_ADD,105,198,75,15,WS_DISABLED
@@ -347,7 +347,7 @@ BEGIN
     CONTROL         "Enable Enhancements",IDC_ENABLE_ENHANCEMENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,98,189,10
     CONTROL         "Unique Game Save Directory",IDC_UNIQUE_SAVE_DIR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,113,189,10
     CONTROL         "Frame rate display",IDC_DISPLAY_FRAMERATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,128,86,10
-    COMBOBOX        IDC_FRAME_DISPLAY_TYPE,101,129,99,57,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FRAME_DISPLAY_TYPE,102,126,109,49,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Show Status Bar",IDC_SHOW_STATUS_BAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,142,189,10
     CONTROL         "Exit Fullscreen on Lose Focus",IDC_EXIT_FULLSCREEN_ON_LOSE_FOCUS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,156,189,10
@@ -403,7 +403,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "",IDC_STATIC,7,7,188,141
+    GROUPBOX        "",IDC_STATIC,5,6,188,141
     CONTROL         "Include Serial Interface DMA tansfers",IDC_SI_DMA,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,20,148,9
     CONTROL         "Include direct writing to Pif Ram",IDC_DIRECT_WRITE,
@@ -560,20 +560,20 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "CPU core style:",IDC_CPU_TYPE_TEXT,4,11,106,10
+    LTEXT           "CPU core style:",IDC_CPU_TYPE_TEXT,6,11,106,10
     COMBOBOX        IDC_CPU_TYPE,113,8,99,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Function lookup method:",IDC_FUNCFIND_TEXT,4,27,106,10
+    LTEXT           "Function lookup method:",IDC_FUNCFIND_TEXT,6,27,106,10
     COMBOBOX        IDC_FUNCFIND,113,25,99,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,6,42,208,1
     CONTROL         "Register caching",IDC_ROM_REGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,95,10
-    CONTROL         "Advanced Block Linking",IDC_BLOCK_LINKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,49,95,10
+    CONTROL         "Advanced Block Linking",IDC_BLOCK_LINKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,49,97,10
     CONTROL         "Fast SP",IDC_ROM_FASTSP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,75,91,10
     CONTROL         "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,62,95,10
     GROUPBOX        "Self Mod Methods",IDC_SMM_FRAME,4,87,208,54
     CONTROL         "Cache",IDC_SMM_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,99,89,10
-    CONTROL         "Store Instruction",IDC_SMM_STORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,99,89,10
+    CONTROL         "Store Instruction",IDC_SMM_STORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,99,89,10
     CONTROL         "PI DMA",IDC_SMM_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,111,89,10
-    CONTROL         "TLB Unmapping",IDC_SMM_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,111,89,10
+    CONTROL         "TLB Unmapping",IDC_SMM_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,111,89,10
     CONTROL         "Start Changed",IDC_SMM_VALIDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,123,89,10
     CONTROL         "FPU Register caching",IDC_ROM_FPUREGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,62,95,10
 END
@@ -585,8 +585,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     COMBOBOX        GFX_LIST,7,18,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "About",GFX_ABOUT,166,18,44,13,WS_DISABLED
-    COMBOBOX        AUDIO_LIST,7,48,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "About",AUDIO_ABOUT,166,48,44,13,WS_DISABLED
+    COMBOBOX        AUDIO_LIST,7,47,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "About",AUDIO_ABOUT,166,47,44,13,WS_DISABLED
     COMBOBOX        CONT_LIST,7,76,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "About",CONT_ABOUT,166,76,44,13,WS_DISABLED
     COMBOBOX        RSP_LIST,7,105,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
@@ -594,7 +594,7 @@ BEGIN
     CONTROL         "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,127,193,10
     CONTROL         "Use High Level Audio",IDC_HLE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,140,188,10
     GROUPBOX        "Graphics:",IDC_GFX_NAME,6,6,208,29
-    GROUPBOX        "Audio:",IDC_AUDIO_NAME,6,38,208,29
+    GROUPBOX        "Audio:",IDC_AUDIO_NAME,6,37,208,29
     GROUPBOX        "Controller:",IDC_CONT_NAME,6,66,208,29
     GROUPBOX        "Reality Signal Processor: ",IDC_RSP_NAME,6,96,208,29
 END
@@ -604,8 +604,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Status:",IDC_STATUS_TEXT,6,12,74,10
-    COMBOBOX        IDC_STATUS_TYPE,80,10,131,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Status:",IDC_STATUS_TEXT,6,10,74,10
+    COMBOBOX        IDC_STATUS_TYPE,80,8,131,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Notes (Core)",IDC_NOTES_CORE_TEXT,6,26,74,10
     EDITTEXT        IDC_NOTES_CORE,80,26,132,30,ES_AUTOHSCROLL
     LTEXT           "Notes (Plugin)",IDC_NOTES_PLUGIN_TEXT,6,63,74,10
@@ -1234,11 +1234,11 @@ BEGIN
     COMBOBOX        IDC_RDRAM_SIZE_KNOWN,102,6,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Memory Size (Unknown):",IDC_MEMORY_SIZE_UNKOWN_TEXT,6,23,91,10
     COMBOBOX        IDC_RDRAM_SIZE_UNKNOWN,102,21,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Counter Factor:",IDC_COUNTFACT_TEXT,6,37,91,10
+    LTEXT           "Counter Factor:",IDC_COUNTFACT_TEXT,6,38,91,10
     COMBOBOX        IDC_COUNTFACT,102,36,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Vi Refresh Rate:",IDC_VIREFESH_TEXT,6,53,91,10
     EDITTEXT        IDC_VIREFRESH,102,51,109,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,67,91,10
+    LTEXT           "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,68,91,10
     EDITTEXT        IDC_COUNTPERBYTE,102,66,109,12,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "Disk Seek Timing:",IDC_DISKSEEKTIMING_TEXT,6,82,91,10
     COMBOBOX        IDC_DISKSEEKTIMING,102,80,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -1248,7 +1248,7 @@ BEGIN
     CONTROL         "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,110,107,10
     CONTROL         "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,122,91,10
     CONTROL         "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,122,107,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,122,115,10
 END
 
 IDD_Enhancement_Config DIALOGEX 0, 0, 206, 214