diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp
index 159c6df635..2fbafff0ff 100644
--- a/frontend/menu/rmenu_xui.cpp
+++ b/frontend/menu/rmenu_xui.cpp
@@ -1022,24 +1022,13 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
          }
          break;
       case SETTING_GAMMA_CORRECTION_ENABLED:
-         if (input == XUI_CONTROL_NAVIGATE_LEFT)
-         {
-            if (g_extern.main_is_init)
-            {
-               g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
-               driver.video->restart();
-               XuiListSetText(m_menulist, SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
-            }
-         }
-         else if (input == XUI_CONTROL_NAVIGATE_RIGHT ||
+         if (input == XUI_CONTROL_NAVIGATE_LEFT ||
+               input == XUI_CONTROL_NAVIGATE_RIGHT ||
                input == XUI_CONTROL_NAVIGATE_OK)
          {
-            if (g_extern.main_is_init)
-            {
-               g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
-               driver.video->restart();
-               XuiListSetText(m_menulist, SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
-            }
+            g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
+            XuiListSetText(m_menulist, SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
+            msg_queue_push(g_extern.msg_queue, "You need to restart for this change to take effect.\n", 1, 90);
          }
          break;
       case SETTING_HW_TEXTURE_FILTER:
@@ -1441,12 +1430,9 @@ HRESULT CRetroArchMain::OnControlNavigate(XUIMessageControlNavigate *pControlNav
          XuiListSetText(m_menulist, INGAME_MENU_REWIND_GRANULARITY, strw_buffer);
          break;
       case INGAME_MENU_FRAME_ADVANCE:
-         if (g_extern.main_is_init)
-         {
-            g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
-            settings_set(1ULL << S_FRAME_ADVANCE);
-            process_input_ret = -1;
-         }
+         g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
+         settings_set(1ULL << S_FRAME_ADVANCE);
+         process_input_ret = -1;
          break;
       case INGAME_MENU_QUIT_RETROARCH:
          if (input == XUI_CONTROL_NAVIGATE_OK)
@@ -1682,15 +1668,6 @@ bool menu_iterate_xui(void)
 
    XuiRenderBegin( app.GetDC(), D3DCOLOR_ARGB( 255, 0, 0, 0 ) );
 
-   D3DVIEWPORT vp = {0};
-   vp.Width  = d3d->win_width;
-   vp.Height = d3d->win_height;
-   vp.X      = 0;
-   vp.Y      = 0;
-   vp.MinZ   = 0.0f;
-   vp.MaxZ   = 1.0f;
-   RD3DDevice_SetViewport(d3dr, &vp); 
-
    D3DXMATRIX matOrigView;
    XuiRenderGetViewTransform( app.GetDC(), &matOrigView );
 
diff --git a/media/360/hd/rarch_main.xui b/media/360/hd/rarch_main.xui
index 1806cfcdfd..703eeeb243 100644
--- a/media/360/hd/rarch_main.xui
+++ b/media/360/hd/rarch_main.xui
@@ -8,7 +8,7 @@
 <Id>XuiScene1</Id>
 <Width>824.000061</Width>
 <Height>496.000061</Height>
-<Position>225.521820,110.438545,0.000000</Position>
+<Position>80.519997,110.438545,0.000000</Position>
 <ClassOverride>RetroArchMain</ClassOverride>
 </Properties>
 <XuiText>
@@ -270,13 +270,73 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
 <Id>XuiBackButton</Id>
 <Width>208.632019</Width>
 <Height>36.000000</Height>
-<Position>568.000061,432.000000,0.000000</Position>
+<Position>568.000061,437.000000,0.000000</Position>
 <Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
@@ -286,7 +346,7 @@
 <Id>XuiTxtBottom</Id>
 <Width>521.056030</Width>
 <Height>40.000000</Height>
-<Position>43.581604,431.159973,0.000000</Position>
+<Position>43.581604,436.159973,0.000000</Position>
 <TextColor>0xff0f0f0f</TextColor>
 <DropShadowColor>0x800f0f0f</DropShadowColor>
 <Font>Arial Unicode MS</Font>