diff --git a/360/media/hd/rarch_filebrowser.xui b/360/media/hd/rarch_filebrowser.xui
index 6033bd1022..37f004bb52 100644
--- a/360/media/hd/rarch_filebrowser.xui
+++ b/360/media/hd/rarch_filebrowser.xui
@@ -30,8 +30,6 @@
 <Width>945.200073</Width>
 <Height>376.000031</Height>
 <Position>22.799980,88.000000,0.000000</Position>
-<NavLeft>XuiBackButton1</NavLeft>
-<NavRight>XuiBackButton1</NavRight>
 <NavUp>XuiBtnGameDir</NavUp>
 <NavDown>XuiBtnGameDir</NavDown>
 </Properties>
@@ -131,6 +129,18 @@
 <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>
@@ -138,10 +148,6 @@
 <Width>204.599976</Width>
 <Height>36.000000</Height>
 <Position>355.115234,484.396851,0.000000</Position>
-<NavLeft>XuiBtnCacheDir</NavLeft>
-<NavRight>XuiBtnGameDir</NavRight>
-<NavUp>XuiRomList</NavUp>
-<NavDown>XuiRomList</NavDown>
 <Text>Go back to menu</Text>
 <PressKey>22593</PressKey>
 </Properties>
@@ -171,7 +177,6 @@
 <Width>115.640007</Width>
 <Height>38.000000</Height>
 <Position>31.999985,480.000061,0.000000</Position>
-<NavLeft>XuiBackButton1</NavLeft>
 <NavRight>XuiBtnCacheDir</NavRight>
 <NavUp>XuiRomList</NavUp>
 <NavDown>XuiRomList</NavDown>
@@ -185,7 +190,6 @@
 <Height>38.000000</Height>
 <Position>161.999985,480.000061,0.000000</Position>
 <NavLeft>XuiBtnGameDir</NavLeft>
-<NavRight>XuiBackButton1</NavRight>
 <NavUp>XuiRomList</NavUp>
 <NavDown>XuiRomList</NavDown>
 <Text>cache:</Text>
diff --git a/360/media/hd/rarch_libretrocore_browser.xui b/360/media/hd/rarch_libretrocore_browser.xui
index 9bd26204f9..8238f005de 100644
--- a/360/media/hd/rarch_libretrocore_browser.xui
+++ b/360/media/hd/rarch_libretrocore_browser.xui
@@ -30,10 +30,6 @@
 <Width>857.200195</Width>
 <Height>406.400024</Height>
 <Position>22.799980,81.600006,0.000000</Position>
-<NavLeft>XuiBackButton1</NavLeft>
-<NavRight>XuiBackButton1</NavRight>
-<NavUp>XuiBackButton1</NavUp>
-<NavDown>XuiBackButton1</NavDown>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -155,6 +151,18 @@
 <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>
@@ -162,10 +170,6 @@
 <Width>219.000000</Width>
 <Height>36.000000</Height>
 <Position>680.000061,504.000061,0.000000</Position>
-<NavLeft>XuiRomList</NavLeft>
-<NavRight>XuiRomList</NavRight>
-<NavUp>XuiRomList</NavUp>
-<NavDown>XuiRomList</NavDown>
 <Text>Go back to menu</Text>
 <PressKey>22593</PressKey>
 </Properties>
diff --git a/360/media/hd/rarch_quickmenu.xui b/360/media/hd/rarch_quickmenu.xui
index 78cb3ca807..d1ba7e28c7 100644
--- a/360/media/hd/rarch_quickmenu.xui
+++ b/360/media/hd/rarch_quickmenu.xui
@@ -24,30 +24,12 @@
 <TextStyle>21</TextStyle>
 </Properties>
 </XuiText>
-<XuiBackButton>
-<Properties>
-<Id>XuiBackButton</Id>
-<Width>208.632019</Width>
-<Height>36.000000</Height>
-<Position>568.000061,432.000000,0.000000</Position>
-<NavLeft>XuiQuickMenuList</NavLeft>
-<NavRight>XuiQuickMenuList</NavRight>
-<NavUp>XuiQuickMenuList</NavUp>
-<NavDown>XuiQuickMenuList</NavDown>
-<Text>Go back to menu</Text>
-<PressKey>22593</PressKey>
-</Properties>
-</XuiBackButton>
 <XuiCommonList>
 <Properties>
 <Id>XuiQuickMenuList</Id>
 <Width>723.120056</Width>
 <Height>367.040009</Height>
 <Position>44.880005,64.959991,0.000000</Position>
-<NavLeft>XuiBackButton</NavLeft>
-<NavRight>XuiBackButton</NavRight>
-<NavUp>XuiBackButton</NavUp>
-<NavDown>XuiBackButton</NavDown>
 <ItemsText>Load State
 Save State
 Aspect Ratio: 
@@ -121,6 +103,40 @@ Return to Dashboard
 <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>
+<Text>Go back to menu</Text>
+<PressKey>22593</PressKey>
+</Properties>
+</XuiBackButton>
 </XuiScene>
 </XuiCanvas>
diff --git a/360/media/hd/rarch_settings.xui b/360/media/hd/rarch_settings.xui
index f6000a0ddc..40989583bf 100644
--- a/360/media/hd/rarch_settings.xui
+++ b/360/media/hd/rarch_settings.xui
@@ -24,30 +24,12 @@
 <TextStyle>21</TextStyle>
 </Properties>
 </XuiText>
-<XuiBackButton>
-<Properties>
-<Id>XuiBackButton</Id>
-<Width>208.632019</Width>
-<Height>36.000000</Height>
-<Position>536.000000,448.000000,0.000000</Position>
-<NavLeft>XuiSettingsList</NavLeft>
-<NavRight>XuiSettingsList</NavRight>
-<NavUp>XuiSettingsList</NavUp>
-<NavDown>XuiSettingsList</NavDown>
-<Text>Go back to menu</Text>
-<PressKey>22593</PressKey>
-</Properties>
-</XuiBackButton>
 <XuiCommonList>
 <Properties>
 <Id>XuiSettingsList</Id>
 <Width>683.120056</Width>
 <Height>383.040009</Height>
 <Position>44.880005,64.959991,0.000000</Position>
-<NavLeft>XuiBackButton</NavLeft>
-<NavRight>XuiBackButton</NavRight>
-<NavUp>XuiBackButton</NavUp>
-<NavDown>XuiBackButton</NavDown>
 <ItemsText>Rewind:
 Gamma Correction:
 Shader #1: 
@@ -165,6 +147,40 @@ Custom Scaling/Dual Shaders
 <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>536.000000,448.000000,0.000000</Position>
+<Text>Go back to menu</Text>
+<PressKey>22593</PressKey>
+</Properties>
+</XuiBackButton>
 </XuiScene>
 </XuiCanvas>
diff --git a/360/media/hd/rarch_shader_browser.xui b/360/media/hd/rarch_shader_browser.xui
index c8b579d554..1576668f02 100644
--- a/360/media/hd/rarch_shader_browser.xui
+++ b/360/media/hd/rarch_shader_browser.xui
@@ -30,10 +30,6 @@
 <Width>857.200195</Width>
 <Height>406.400024</Height>
 <Position>22.799980,81.600006,0.000000</Position>
-<NavLeft>XuiBackButton1</NavLeft>
-<NavRight>XuiBackButton1</NavRight>
-<NavUp>XuiBackButton1</NavUp>
-<NavDown>XuiBackButton1</NavDown>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -179,6 +175,18 @@
 <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>
@@ -186,10 +194,6 @@
 <Width>219.000000</Width>
 <Height>36.000000</Height>
 <Position>680.000061,504.000061,0.000000</Position>
-<NavLeft>XuiRomList</NavLeft>
-<NavRight>XuiRomList</NavRight>
-<NavUp>XuiRomList</NavUp>
-<NavDown>XuiRomList</NavDown>
 <Text>Go back to menu</Text>
 <PressKey>22593</PressKey>
 </Properties>
diff --git a/360/media/sd/rarch_filebrowser.xui b/360/media/sd/rarch_filebrowser.xui
index 72a65d4735..8a1fefcd56 100644
--- a/360/media/sd/rarch_filebrowser.xui
+++ b/360/media/sd/rarch_filebrowser.xui
@@ -30,8 +30,6 @@
 <Width>536.582458</Width>
 <Height>170.800018</Height>
 <Position>22.799980,81.600006,0.000000</Position>
-<NavLeft>XuiBackButton1</NavLeft>
-<NavRight>XuiBackButton1</NavRight>
 <NavUp>XuiBtnGameDir</NavUp>
 <NavDown>XuiBtnGameDir</NavDown>
 </Properties>
@@ -119,6 +117,18 @@
 <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>
@@ -126,10 +136,6 @@
 <Width>204.599976</Width>
 <Height>36.000000</Height>
 <Position>353.115234,281.396820,0.000000</Position>
-<NavLeft>XuiBtnCacheDir</NavLeft>
-<NavRight>XuiBtnGameDir</NavRight>
-<NavUp>XuiRomList</NavUp>
-<NavDown>XuiRomList</NavDown>
 <Text>Go back to menu</Text>
 <PressKey>22593</PressKey>
 </Properties>
@@ -159,7 +165,6 @@
 <Width>115.640007</Width>
 <Height>38.000000</Height>
 <Position>30.000000,277.000000,0.000000</Position>
-<NavLeft>XuiBackButton1</NavLeft>
 <NavRight>XuiBtnCacheDir</NavRight>
 <NavUp>XuiRomList</NavUp>
 <NavDown>XuiRomList</NavDown>
@@ -173,7 +178,6 @@
 <Height>38.000000</Height>
 <Position>160.000000,277.000000,0.000000</Position>
 <NavLeft>XuiBtnGameDir</NavLeft>
-<NavRight>XuiBackButton1</NavRight>
 <NavUp>XuiRomList</NavUp>
 <NavDown>XuiRomList</NavDown>
 <Text>cache:</Text>
diff --git a/360/media/sd/rarch_libretrocore_browser.xui b/360/media/sd/rarch_libretrocore_browser.xui
index 14cb9f422d..01a196d110 100644
--- a/360/media/sd/rarch_libretrocore_browser.xui
+++ b/360/media/sd/rarch_libretrocore_browser.xui
@@ -30,10 +30,6 @@
 <Width>536.582458</Width>
 <Height>170.800018</Height>
 <Position>22.799980,81.600006,0.000000</Position>
-<NavLeft>XuiBackButton1</NavLeft>
-<NavRight>XuiBackButton1</NavRight>
-<NavUp>XuiBackButton1</NavUp>
-<NavDown>XuiBackButton1</NavDown>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -131,6 +127,18 @@
 <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>
@@ -138,10 +146,6 @@
 <Width>219.000000</Width>
 <Height>36.000000</Height>
 <Position>338.715210,281.396820,0.000000</Position>
-<NavLeft>XuiRomList</NavLeft>
-<NavRight>XuiRomList</NavRight>
-<NavUp>XuiRomList</NavUp>
-<NavDown>XuiRomList</NavDown>
 <Text>Go back to menu</Text>
 <PressKey>22593</PressKey>
 </Properties>
diff --git a/360/media/sd/rarch_quickmenu.xui b/360/media/sd/rarch_quickmenu.xui
index 43efa6e6f4..7e460bb7b5 100644
--- a/360/media/sd/rarch_quickmenu.xui
+++ b/360/media/sd/rarch_quickmenu.xui
@@ -24,30 +24,12 @@
 <TextStyle>21</TextStyle>
 </Properties>
 </XuiText>
-<XuiBackButton>
-<Properties>
-<Id>XuiBackButton</Id>
-<Width>208.632019</Width>
-<Height>36.000000</Height>
-<Position>356.670013,309.000000,0.000000</Position>
-<NavLeft>XuiQuickMenuList</NavLeft>
-<NavRight>XuiQuickMenuList</NavRight>
-<NavUp>XuiQuickMenuList</NavUp>
-<NavDown>XuiQuickMenuList</NavDown>
-<Text>Go back to menu</Text>
-<PressKey>22593</PressKey>
-</Properties>
-</XuiBackButton>
 <XuiCommonList>
 <Properties>
 <Id>XuiQuickMenuList</Id>
 <Width>492.000000</Width>
 <Height>232.720001</Height>
 <Position>44.880005,64.959991,0.000000</Position>
-<NavLeft>XuiBackButton</NavLeft>
-<NavRight>XuiBackButton</NavRight>
-<NavUp>XuiBackButton</NavUp>
-<NavDown>XuiBackButton</NavDown>
 <ItemsText>Load State
 Save State
 Aspect Ratio: 
@@ -109,6 +91,40 @@ Return to Dashboard
 <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>356.670013,309.000000,0.000000</Position>
+<Text>Go back to menu</Text>
+<PressKey>22593</PressKey>
+</Properties>
+</XuiBackButton>
 </XuiScene>
 </XuiCanvas>
diff --git a/360/media/sd/rarch_settings.xui b/360/media/sd/rarch_settings.xui
index 46b7aaee6f..3c27007380 100644
--- a/360/media/sd/rarch_settings.xui
+++ b/360/media/sd/rarch_settings.xui
@@ -24,30 +24,12 @@
 <TextStyle>21</TextStyle>
 </Properties>
 </XuiText>
-<XuiBackButton>
-<Properties>
-<Id>XuiBackButton</Id>
-<Width>208.632019</Width>
-<Height>36.000000</Height>
-<Position>356.670013,309.000000,0.000000</Position>
-<NavLeft>XuiSettingsList</NavLeft>
-<NavRight>XuiSettingsList</NavRight>
-<NavUp>XuiSettingsList</NavUp>
-<NavDown>XuiSettingsList</NavDown>
-<Text>Go back to menu</Text>
-<PressKey>22593</PressKey>
-</Properties>
-</XuiBackButton>
 <XuiCommonList>
 <Properties>
 <Id>XuiSettingsList</Id>
 <Width>492.000000</Width>
 <Height>232.720001</Height>
 <Position>44.880005,64.959991,0.000000</Position>
-<NavLeft>XuiBackButton</NavLeft>
-<NavRight>XuiBackButton</NavRight>
-<NavUp>XuiBackButton</NavUp>
-<NavDown>XuiBackButton</NavDown>
 <ItemsText>Rewind:
 Gamma Correction:
 Shader #1:
@@ -141,6 +123,40 @@ Cutom Scaling/Dual Shaders:
 <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>356.670013,309.000000,0.000000</Position>
+<Text>Go back to menu</Text>
+<PressKey>22593</PressKey>
+</Properties>
+</XuiBackButton>
 </XuiScene>
 </XuiCanvas>
diff --git a/360/media/sd/rarch_shader_browser.xui b/360/media/sd/rarch_shader_browser.xui
index 702f1ab0cc..5a88d5284b 100644
--- a/360/media/sd/rarch_shader_browser.xui
+++ b/360/media/sd/rarch_shader_browser.xui
@@ -30,10 +30,6 @@
 <Width>536.582458</Width>
 <Height>170.800018</Height>
 <Position>22.799980,81.600006,0.000000</Position>
-<NavLeft>XuiBackButton1</NavLeft>
-<NavRight>XuiBackButton1</NavRight>
-<NavUp>XuiBackButton1</NavUp>
-<NavDown>XuiBackButton1</NavDown>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -155,6 +151,18 @@
 <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>
@@ -162,10 +170,6 @@
 <Width>219.000000</Width>
 <Height>36.000000</Height>
 <Position>338.715210,281.396820,0.000000</Position>
-<NavLeft>XuiRomList</NavLeft>
-<NavRight>XuiRomList</NavRight>
-<NavUp>XuiRomList</NavUp>
-<NavDown>XuiRomList</NavDown>
 <Text>Go back to menu</Text>
 <PressKey>22593</PressKey>
 </Properties>