--- a/mm7_5.cpp	Mon Apr 22 09:25:22 2013 +0600
+++ b/mm7_5.cpp	Mon Apr 22 17:34:36 2013 +0600
@@ -88,7 +88,7 @@
   int v37; // eax@341
   int v38; // eax@358
   SHORT v39; // ax@365
-  signed int v40; // eax@365
+  //signed int v40; // eax@365
   char *v41; // eax@380
   int v42; // eax@396
   POINT *pPoint; // eax@397
@@ -1621,11 +1621,13 @@
           pVideoPlayer->Unload();
           sub_44603D();
           start_event_seq_number = 0;
-          goto LABEL_422;
+          viewparams->bRedrawGameUI = v0;
+          continue;
         case UIMSG_CycleCharacters:
           v39 = GetAsyncKeyState(VK_SHIFT);
-          v40 = CycleCharacter(v39);
-          goto LABEL_421;
+          uActiveCharacter = CycleCharacter(v39);
+          viewparams->bRedrawGameUI = v0;
+          continue;
         case UIMSG_OnTravelByFoot:
           if ( pMessageQueue_50CBD0->uNumMessages )
             pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
@@ -1725,7 +1727,8 @@
             pCurrentScreen = SCREEN_GAME;
             pGameLoadingUI_ProgressBar->Release();
           }
-          goto LABEL_422;
+          viewparams->bRedrawGameUI = v0;
+          continue;
         case UIMSG_5B:
           goto LABEL_387;
         case UIMSG_BE:
@@ -1844,10 +1847,7 @@
             pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
           if ( unk_50C9A0 )
           {
-            v40 = uMessageParam;
-LABEL_421:
-            uActiveCharacter = v40;
-LABEL_422:
+            uActiveCharacter = uMessageParam;
             viewparams->bRedrawGameUI = v0;
           }
           else
@@ -3024,14 +3024,14 @@
 //LABEL_709:
           dword_506544 = v0;
           continue;
-        case UIMSG_55:
+        case UIMSG_ChangeDetaliz:
           bRingsShownInCharScreen ^= v0;
-		  pCharacterScreen_DetalizBtn->Release();
+          pCharacterScreen_DetalizBtn->Release();
           pCharacterScreen_DollBtn->Release();
           if ( bRingsShownInCharScreen )
           {
-            v128 = (uTextureID_5118C8 != -1 ? pIcons_LOD->pTextures[uTextureID_5118C8].uTextureHeight : 26);
-            v125 = (uTextureID_5118C8 != -1 ? pIcons_LOD->pTextures[uTextureID_5118C8].uTextureWidth : 24);
+            v128 = (uTextureID_detaliz_close_button != -1 ? pIcons_LOD->pTextures[uTextureID_detaliz_close_button].uTextureHeight : 26);
+            v125 = (uTextureID_detaliz_close_button != -1 ? pIcons_LOD->pTextures[uTextureID_detaliz_close_button].uTextureWidth : 24);
             v123 = 445;
             v121 = 470;
           }
@@ -3042,12 +3042,13 @@
             v123 = 300;
             v121 = 600;
           }
-          pCharacterScreen_DetalizBtn = pGUIWindow_CurrentMenu->CreateButton(v121, v123, v125, v128, v0, 0, UIMSG_MainMenu_ShowLoadWindow, 0, 0,
+          pCharacterScreen_DetalizBtn = pGUIWindow_CurrentMenu->CreateButton(v121, v123, v125, v128, v0, 0, UIMSG_ChangeDetaliz, 0, 0,
                          pGlobalTXT_LocalizationStrings[64],// "Detail Toggle"
                          0);
-          pCharacterScreen_DollBtn = pGUIWindow_CurrentMenu->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, v0, 0, UIMSG_85, 0, 0, v1, 0);
-          goto LABEL_422;
-        case UIMSG_85:
+          pCharacterScreen_DollBtn = pGUIWindow_CurrentMenu->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, v0, 0, UIMSG_ClickPaperdoll, 0, 0, v1, 0);
+          viewparams->bRedrawGameUI = v0;
+          continue;
+        case UIMSG_ClickPaperdoll:
           OnPaperdollLeftClick();
           continue;
         case UIMSG_73: