diff --git a/resources/lib/functions.py b/resources/lib/functions.py
index 7937697..a4c84a5 100644
--- a/resources/lib/functions.py
+++ b/resources/lib/functions.py
@@ -411,19 +411,18 @@ def addContextMenu(details, extraData, folder):
         # watched/unwatched
         if extraData.get("playcount") == "0":
             argsToPass = 'markWatched,' + extraData.get('id')
-            commands.append(("Emby: Mark as watched", "XBMC.RunScript(" + scriptToRun + ", " + argsToPass + ")"))
+            commands.append(("Emby: Mark watched", "XBMC.RunScript(" + scriptToRun + ", " + argsToPass + ")"))
         else:
             argsToPass = 'markUnwatched,' + extraData.get('id')
-            commands.append(("Emby: Mark as unwatched", "XBMC.RunScript(" + scriptToRun + ", " + argsToPass + ")"))
+            commands.append(("Emby: Mark unwatched", "XBMC.RunScript(" + scriptToRun + ", " + argsToPass + ")"))
             
         # favourite add/remove
-
-        #if extraData.get('favorite') != 'true':
-        #    argsToPass = 'markFavorite,' + extraData.get('id')
-        #    commands.append(("Add to Favourites", "XBMC.RunScript(" + scriptToRun + ", " + argsToPass + ")"))
-        #else:
-        #    argsToPass = 'unmarkFavorite,' + extraData.get('id')
-        #    commands.append(("Remove from Favourites", "XBMC.RunScript(" + scriptToRun + ", " + argsToPass + ")"))
+        if extraData.get('favorite') != 'true':
+            argsToPass = 'markFavorite,' + extraData.get('id')
+            commands.append(("Emby: Set favourite", "XBMC.RunScript(" + scriptToRun + ", " + argsToPass + ")"))
+        else:
+            argsToPass = 'unmarkFavorite,' + extraData.get('id')
+            commands.append(("Emby: Unset favourite", "XBMC.RunScript(" + scriptToRun + ", " + argsToPass + ")"))
         
         # delete
         argsToPass = 'delete,' + extraData.get('id')
diff --git a/resources/lib/menu_functions.py b/resources/lib/menu_functions.py
index ebb0beb..6904f5a 100644
--- a/resources/lib/menu_functions.py
+++ b/resources/lib/menu_functions.py
@@ -164,11 +164,32 @@ def getCollections(detailsString):
     # Add standard nodes
     item_data = {}
     item_data['address'] = server
-    item_data['title'] = "All Movies"
+    item_data['title'] = "Movies - All"
     item_data[
         'path'] = '/emby/Users/' + userid + '/Items?Fields=' + detailsString + '&Recursive=true&IncludeItemTypes=Movie&CollapseBoxSetItems=true&ImageTypeLimit=1&format=json'
     collections.append(item_data)
 
+    item_data = {}
+    item_data['address'] = server
+    item_data['title'] = "Movies - Recently Added"
+    item_data[
+        'path'] = '/emby/Users/' + userid + '/Items?Limit=' + '20' + '&Recursive=true&SortBy=DateCreated&Fields=' + detailsString + '&SortOrder=Descending&Filters=IsUnplayed,IsNotFolder&IncludeItemTypes=Movie&ImageTypeLimit=1&format=json'
+    collections.append(item_data)
+
+    item_data = {}
+    item_data['address'] = server
+    item_data['title'] = "Movies - In Progress"
+    item_data[
+        'path'] = '/emby/Users/' + userid + '/Items?Limit=' + '20' + '&Recursive=true&Fields=' + detailsString + '&Filters=IsResumable&IncludeItemTypes=Movie&ImageTypeLimit=1&format=json'
+    collections.append(item_data)
+
+    item_data = {}
+    item_data['address'] = server
+    item_data['title'] = "Movies - Favorites"
+    item_data[
+        'path'] = '/emby/Users/' + userid + '/Items?Fields=' + detailsString + '&Recursive=true&Filters=IsFavorite&IncludeItemTypes=Movie&CollapseBoxSetItems=true&ImageTypeLimit=1&format=json'
+    collections.append(item_data)
+
     item_data = {}
     item_data['address'] = server
     item_data['title'] = "BoxSets"
@@ -178,42 +199,35 @@ def getCollections(detailsString):
 
     item_data = {}
     item_data['address'] = server
-    item_data['title'] = "All TV"
+    item_data['title'] = "TV Shows - All"
     item_data[
         'path'] = '/emby/Users/' + userid + '/Items?Fields=' + detailsString + '&Recursive=true&IncludeItemTypes=Series&ImageTypeLimit=1&format=json'
     collections.append(item_data)
 
     item_data = {}
     item_data['address'] = server
-    item_data['title'] = "Recently Added Movies"
+    item_data['title'] = "TV Shows - Favorites"
     item_data[
-        'path'] = '/emby/Users/' + userid + '/Items?Limit=' + '20' + '&Recursive=true&SortBy=DateCreated&Fields=' + detailsString + '&SortOrder=Descending&Filters=IsUnplayed,IsNotFolder&IncludeItemTypes=Movie&ImageTypeLimit=1&format=json'
+        'path'] = '/emby/Users/' + userid + '/Items?Fields=' + detailsString + '&Recursive=true&Filters=IsFavorite&IncludeItemTypes=Series&ImageTypeLimit=1&format=json'
     collections.append(item_data)
 
     item_data = {}
     item_data['address'] = server
-    item_data['title'] = "Recently Added Episodes"
+    item_data['title'] = "Episodes - Recently Added"
     item_data[
         'path'] = '/emby/Users/' + userid + '/Items?Limit=' + '20' + '&Recursive=true&SortBy=DateCreated&Fields=' + detailsString + '&SortOrder=Descending&Filters=IsUnplayed,IsNotFolder&IsVirtualUnaired=false&IsMissing=False&IncludeItemTypes=Episode&ImageTypeLimit=1&format=json'
     collections.append(item_data)
 
     item_data = {}
     item_data['address'] = server
-    item_data['title'] = "In Progress Movies"
-    item_data[
-        'path'] = '/emby/Users/' + userid + '/Items?Limit=' + '20' + '&Recursive=true&Fields=' + detailsString + '&Filters=IsResumable&IncludeItemTypes=Movie&ImageTypeLimit=1&format=json'
-    collections.append(item_data)
-
-    item_data = {}
-    item_data['address'] = server
-    item_data['title'] = "In Progress Episodes"
+    item_data['title'] = "Episodes - In Progress"
     item_data[
         'path'] = '/emby/Users/' + userid + '/Items?Limit=' + '20' + '&Recursive=true&Fields=' + detailsString + '&Filters=IsResumable&IncludeItemTypes=Episode&ImageTypeLimit=1&format=json'
     collections.append(item_data)
 
     item_data = {}
     item_data['address'] = server
-    item_data['title'] = "Next Episodes"
+    item_data['title'] = "Episodes - Next Up"
     item_data[
         'path'] = '/emby/Shows/NextUp/?Userid=' + userid + '&Limit=' + '20' + '&Recursive=true&Fields=' + detailsString + '&Filters=IsUnplayed,IsNotFolder&IsVirtualUnaired=false&IsMissing=False&IncludeItemTypes=Episode&ImageTypeLimit=1&format=json'
     collections.append(item_data)