diff --git a/720p/Custom_Overlay.xml b/720p/Custom_Overlay.xml
index 42ce6a7..c8a329e 100644
--- a/720p/Custom_Overlay.xml
+++ b/720p/Custom_Overlay.xml
@@ -3,6 +3,10 @@
 	<zorder>2</zorder>
 	<visible>!Window.IsVisible(startup)</visible>
 	<controls>
+	
+	
+	<!--  For mouse pos and control number enable debugging in addon.xml  -->
+	
 		<!--  Global debug grid  -->
 		<control type="image">
 			<visible>Skin.HasSetting(DebugGrid)</visible>
diff --git a/720p/DialogButtonMenu.xml b/720p/DialogButtonMenu.xml
index 3c05216..00cfd09 100644
--- a/720p/DialogButtonMenu.xml
+++ b/720p/DialogButtonMenu.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <window id="111">
-	<defaultcontrol always="true">11</defaultcontrol>
+	<defaultcontrol always="true">9001</defaultcontrol>
+
 	<coordinates>
 		<system>1</system>
 		<left>0</left>
@@ -19,18 +20,114 @@
 			<animation effect="fade" start="0" end="80" time="900">WindowOpen</animation>
 			<animation effect="fade" start="80" end="0" time="900">WindowClose</animation>
 		</control>
+
 		<control type="label" id="3100">
 			<include>HiddenButton</include>
 		</control>
+		
 		<control type="group">
 			<include>DialogEffect</include>
+			
+					
+			<control type="list" id="9001">
+				<left>442</left>
+				<top>240</top>
+				<width>376</width>
+				<height>401</height>
+				<onup>50</onup>
+				<ondown>50</ondown>
+				<onleft>63</onleft>
+				<onright>noop</onright>
+				<pagecontrol>63</pagecontrol>
+				
+				<itemlayout width="400" height="40">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>376</width>
+						<height>40</height>
+						<aspectratio>stretch</aspectratio>
+						<texture>white.png</texture>
+						<colordiffuse>$VAR[DialogBGColor]</colordiffuse>
+					</control>
+					<control type="label">
+						<left>188</left>
+						<top>0</top>
+						<width>376</width>
+						<height>40</height>
+						<font>context</font>
+						<textcolor>darklist</textcolor>
+						<aligny>top</aligny>
+						<align>center</align>
+						<scroll>false</scroll>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout width="400" height="40">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>376</width>
+						<height>40</height>
+						<aspectratio>stretch</aspectratio>
+						<texture>white.png</texture>
+						<colordiffuse>skin.string(MainColorString)</colordiffuse>
+					</control>
+					<control type="label">
+						<left>188</left>
+						<top>0</top>
+						<width>376</width>
+						<height>40</height>
+						<font>context</font>
+						<textcolor>white</textcolor>
+						<aligny>top</aligny>
+						<align>center</align>
+						<scroll>false</scroll>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+				</focusedlayout>
+				<content>
+					<item id="1">
+						<label>$LOCALIZE[13012]</label>
+						<onclick>XBMC.Quit()</onclick>
+					</item>
+					<item id="2">
+						<label>$LOCALIZE[13005]</label>
+						<onclick>XBMC.Shutdown()</onclick>
+					</item>
+					<item id="3">
+						<label>$LOCALIZE[13011]</label>
+						<onclick>XBMC.Suspend()</onclick>
+						<visible>System.CanSuspend</visible>
+					</item>
+					<item id="4">
+						<label>$LOCALIZE[13013]</label>
+						<onclick>XBMC.Reset()</onclick>
+						<visible>System.CanReboot</visible>
+					</item>
+					<item id="5">
+						<label>$LOCALIZE[31052]</label>
+						<onclick>System.LogOff</onclick>
+						<visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible>
+						<visible>System.Loggedon</visible>
+					</item>
+					<item id="5">
+						<label>$LOCALIZE[31245]</label>
+						<onclick>Dialog.Close(all,true)</onclick>
+						<onclick>ReloadSkin()</onclick>
+					</item>
+
+				</content>
+
+			</control>
+			
 			<control type="group">
-				<left>420</left>
-				<top>230</top>
-				<control type="image" id="1">
+				<left>442</left>
+				<top>190</top>
+				<width>376</width>
+				<height>401</height>
+				<control type="image">
 					<description>background image</description>
-					<left>22</left>
-					<top>-48</top>
 					<width>376</width>
 					<height>48</height>
 					<texture>white.png</texture>
@@ -39,8 +136,8 @@
 				</control>
 				<control type="label">
 					<left>0</left>
-					<top>-52</top>
-					<width>380</width>
+					<top>0</top>
+					<width>360</width>
 					<height>44</height>
 					<align>right</align>
 					<aligny>center</aligny>
@@ -50,147 +147,17 @@
 				</control>
 				<control type="image">
 					<description>line</description>
-					<left>22</left>
-					<top>-8</top>
+					<left>0</left>
+					<top>47</top>
 					<width>376</width>
 					<height>4</height>
 					<texture>white.png</texture>
 					<aspectratio>stretch</aspectratio>
 					<colordiffuse>blue</colordiffuse>
 				</control>
-				<control type="image" id="2">
-					<description>background image</description>
-					<left>22</left>
-					<top>0</top>
-					<width>376</width>
-					<height>245</height>
-					<texture>white.png</texture>
-					<colordiffuse>$VAR[DialogBGColor]</colordiffuse>
-					<aspectratio>stretch</aspectratio>
-				</control>
-				<control type="image" id="3">
-					<description>background image</description>
-					<left>22</left>
-					<top>195</top>
-					<width>376</width>
-					<height>15</height>
-					<texture>white.png</texture>
-					<colordiffuse>$VAR[DialogBGColor]</colordiffuse>
-					<aspectratio>stretch</aspectratio>
-				</control>
-			</control>
-			<control type="grouplist">
-				<left>442</left>
-				<top>-30</top>
-				<width>401</width>
-				<itemgap>0</itemgap>
-				<align>center</align>
-				<aligny>top</aligny>
-				<onup>300</onup>
-				<orientation>Vertical</orientation>
-				<control type="button" id="11">
-					<font>context</font>
-					<textcolor>darklist</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<disabledcolor>black</disabledcolor>
-					<texturefocus>white.png</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<width>376</width>
-					<height>40</height>
-					<onclick>XBMC.Quit()</onclick>
-					<align>left</align>
-					<aligny>top</aligny>
-					<colordiffuse>skin.string(MainColorString)</colordiffuse>
-					<label>$LOCALIZE[13012]</label>
-				</control>
-				<control type="button" id="15">
-					<description>Shutdown button</description>
-					<font>context</font>
-					<textcolor>darklist</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<disabledcolor>95000000</disabledcolor>
-					<texturefocus>white.png</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<width>376</width>
-					<height>40</height>
-					<onclick>XBMC.Shutdown()</onclick>
-					<!-- onclick condition="System.CanPowerDown">XBMC.Powerdown()</onclick -->
-					<align>left</align>
-					<aligny>top</aligny>
-					<colordiffuse>skin.string(MainColorString)</colordiffuse>
-					<label>13005</label>
-				</control>
-				<control type="button" id="12">
-					<description>Suspend xbmc</description>
-					<font>context</font>
-					<textcolor>darklist</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<disabledcolor>95000000</disabledcolor>
-					<texturefocus>white.png</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<width>376</width>
-					<height>40</height>
-					<onclick>XBMC.Suspend()</onclick>
-					<align>left</align>
-					<aligny>top</aligny>
-					<colordiffuse>skin.string(MainColorString)</colordiffuse>
-					<label>$LOCALIZE[13011]</label>
-					<enable>System.CanSuspend</enable>
-				</control>
-				<control type="button" id="14">
-					<description>Reboot button</description>
-					<font>context</font>
-					<textcolor>darklist</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<disabledcolor>95000000</disabledcolor>
-					<texturefocus>white.png</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<width>376</width>
-					<height>40</height>
-					<onclick>XBMC.Reset()</onclick>
-					<align>left</align>
-					<aligny>top</aligny>
-					<colordiffuse>skin.string(MainColorString)</colordiffuse>
-					<label>13013</label>
-					<enable>System.CanReboot</enable>
-				</control>
-				<control type="button" id="16">
-					<description>Log out</description>
-					<font>context</font>
-					<textcolor>darklist</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<disabledcolor>95000000</disabledcolor>
-					<texturefocus>white.png</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<width>376</width>
-					<height>40</height>
-					<onclick>System.LogOff</onclick>
-					<align>left</align>
-					<aligny>top</aligny>
-					<colordiffuse>skin.string(MainColorString)</colordiffuse>
-					<label>31052</label>
-					<enable>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</enable>
-					<enable>System.Loggedon</enable>
-				</control>
-				<control type="button" id="17">
-					<description>Skin refresh</description>
-					<font>context</font>
-					<textcolor>darklist</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<disabledcolor>95000000</disabledcolor>
-					<texturefocus>white.png</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<width>376</width>
-					<height>40</height>
-					<onclick>Dialog.Close(all,true)</onclick>
-					<onclick>ReloadSkin()</onclick>
-					<!-- onclick>Skin.ToggleSetting(HideDebugInfo)</onclick -->
-					<align>left</align>
-					<aligny>top</aligny>
-					<colordiffuse>skin.string(MainColorString)</colordiffuse>
-					<label>$LOCALIZE[31245]</label>
-				</control>
+
 			</control>
+			
 		</control>
 	</controls>
 </window>
\ No newline at end of file
diff --git a/720p/DialogContextMenu.xml b/720p/DialogContextMenu.xml
index 8c7a9fb..327051d 100644
--- a/720p/DialogContextMenu.xml
+++ b/720p/DialogContextMenu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <window>
-	<defaultcontrol always="true">1000</defaultcontrol>
+	<defaultcontrol always="true">2009</defaultcontrol>
 	<zorder>6</zorder>
 	<coordinates>
 		<system>1</system>
diff --git a/720p/Viewtype_List.xml b/720p/Viewtype_List.xml
index 024dba1..95c836f 100644
--- a/720p/Viewtype_List.xml
+++ b/720p/Viewtype_List.xml
@@ -18,7 +18,6 @@
 				<top>75</top>
 				<width>700</width>
 				<height>613</height>
-				<!-- -438 -->
 				<scrolltime>2</scrolltime>
 				<preloaditems>2</preloaditems>
 				<orientation>vertical</orientation>
diff --git a/720p/Viewtype_LogoPanel.xml b/720p/Viewtype_LogoPanel.xml
index 3b540db..0bb1fed 100644
--- a/720p/Viewtype_LogoPanel.xml
+++ b/720p/Viewtype_LogoPanel.xml
@@ -171,7 +171,7 @@
 								<bordertexture border="3">empty.png</bordertexture>
 								<bordersize>3</bordersize>
 								<fadetime>200</fadetime>
-								<texture colordiffuse="">black.png</texture>
+								<texture>black.png</texture>
 								<colordiffuse>74FFFFFF</colordiffuse>
 							</control>
 							<control type="textbox">