diff --git a/1080i/Home.xml b/1080i/Home.xml
index 1588b2c..e6911b4 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -105,9 +105,9 @@
                         <label>31000</label>
                         <label2></label2>
                         <thumb>-</thumb>
-                        <onclick condition="!Library.HasContent(Video)">ActivateWindow(Videos,files)</onclick>
+                        <onclick condition="!Library.HasContent(Video)">ActivateWindow(Videos,sources://video/)</onclick>
                         <onclick condition="!Library.HasContent(Video)">Skin.SetString(showRecentVideoItems,false)</onclick>
-                        <onclick condition="Library.HasContent(Video)">ActivateWindow(Videos,videodb://)</onclick>
+                        <onclick condition="Library.HasContent(Video)">ActivateWindow(Videos,library://video/)</onclick>
                         <onclick condition="Library.HasContent(Video)">Skin.SetString(showRecentVideoItems,true)</onclick>
                     </item>
                     <item id="2">
diff --git a/1080i/Includes_hubMenuItems.xml b/1080i/Includes_hubMenuItems.xml
index 763bbcc..cba1085 100644
--- a/1080i/Includes_hubMenuItems.xml
+++ b/1080i/Includes_hubMenuItems.xml
@@ -151,13 +151,13 @@
             <item>
                 <visible/>
                 <label>1036</label>
-                <onclick>ActivateWindow(favourites,return)</onclick>
+                <onclick>ActivateWindow(favourites)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
             </item>
             <item>
                 <visible/>
                 <label>1214</label>
-                <onclick>ActivateWindow(Videos,files,return)</onclick>
+                <onclick>ActivateWindow(Videos,sources://video/)</onclick>
                 <onclick>Control.SetFocus(50)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
             </item>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index c14395b..a43e1ba 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -20,6 +20,7 @@
         <value condition="Window.IsActive(videolibrary) + Container.Content(movies)">$LOCALIZE[20342] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]</value>
         <value condition="Window.IsActive(videolibrary) + [Container.Content(seasons) | Container.Content(tvshows) | Container.Content(episodes)]">$LOCALIZE[20343] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
         <value condition="Window.IsActive(videolibrary) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>
+		<value condition="Window.IsActive(videolibrary) + isEmpty(container.foldername)">$LOCALIZE[31012]</value>
 
         <value condition="Window.IsActive(musiclibrary) + SubString(skin.string(showRecentMusicItems),true)">$LOCALIZE[31053]</value>
         <value condition="Window.IsActive(musiclibrary) + SubString(container.folderpath,addons://)">$LOCALIZE[31058]</value>
@@ -30,7 +31,7 @@
 
 
         <value condition="Window.IsActive(musiclibrary) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>
-        <value condition="Window.IsActive(musiclibrary) + isEmpty(container.foldername)">$LOCALIZE[31012]</value>
+        <value condition="Window.IsActive(musiclibrary) + isEmpty(container.foldername)">$LOCALIZE[31053]</value>
 
         <!--
         <value condition="Window.IsActive(musiclibrary) + SubString(container.foldername,playlists)">$LOCALIZE[20011]</value>