diff --git a/resources/lib/DefaultViews.py b/resources/lib/DefaultViews.py
index 8387082..c711689 100644
--- a/resources/lib/DefaultViews.py
+++ b/resources/lib/DefaultViews.py
@@ -50,19 +50,19 @@ class DefaultViews(xbmcgui.WindowXMLDialog):
         self.defaultView = loadSkinDefaults()
             
         # set default values
-        name = self.getNameById(self.defaultView["Movies"])
+        name = self.getNameById(self.defaultView.get("Movies"))
         self.getControl(3010).setLabel(name)
         
-        name = self.getNameById(self.defaultView["BoxSets"])
+        name = self.getNameById(self.defaultView.get("BoxSets"))
         self.getControl(3011).setLabel(name)    
 
-        name = self.getNameById(self.defaultView["Series"])
+        name = self.getNameById(self.defaultView.get("Series"))
         self.getControl(3012).setLabel(name) 
 
-        name = self.getNameById(self.defaultView["Seasons"])
+        name = self.getNameById(self.defaultView.get("Seasons"))
         self.getControl(3013).setLabel(name) 
 
-        name = self.getNameById(self.defaultView["Episodes"])
+        name = self.getNameById(self.defaultView.get("Episodes"))
         self.getControl(3014).setLabel(name)         
         
     def onFocus(self, controlId):      
@@ -72,11 +72,14 @@ class DefaultViews(xbmcgui.WindowXMLDialog):
         pass
     
     def getNameById(self, viewId):
+        if(viewId == None):
+            return "None"
+            
         for name, id in self.viewData.iteritems():
             if id == viewId:
                 return name
             
-        return ""
+        return "None"
     
     def getNextViewName(self, current):
         keys = list(self.viewData.keys())
@@ -97,11 +100,11 @@ class DefaultViews(xbmcgui.WindowXMLDialog):
             
         elif(controlID == 3110):
         
-            self.defaultView["Movies"] = self.viewData[self.getControl(3010).getLabel()]
-            self.defaultView["BoxSets"] = self.viewData[self.getControl(3011).getLabel()]
-            self.defaultView["Series"] = self.viewData[self.getControl(3012).getLabel()]
-            self.defaultView["Seasons"] = self.viewData[self.getControl(3013).getLabel()]
-            self.defaultView["Episodes"] = self.viewData[self.getControl(3014).getLabel()]
+            self.setViewId("Movies", 3010)
+            self.setViewId("BoxSets", 3011)
+            self.setViewId("Series", 3012)
+            self.setViewId("Seasons", 3013)
+            self.setViewId("Episodes", 3014)
         
             __addon__ = xbmcaddon.Addon(id='plugin.video.mbcon')
             __addondir__ = xbmc.translatePath( __addon__.getAddonInfo('profile'))
@@ -115,3 +118,10 @@ class DefaultViews(xbmcgui.WindowXMLDialog):
         
         pass
         
+    def setViewId(self, viewName, labelId):
+        viewId = self.viewData.get(self.getControl(labelId).getLabel())
+        if(viewId == None):
+            return
+        else:
+            self.defaultView[viewName] = viewId
+            
diff --git a/resources/lib/Functions.py b/resources/lib/Functions.py
index f9fa480..dd50199 100644
--- a/resources/lib/Functions.py
+++ b/resources/lib/Functions.py
@@ -536,14 +536,7 @@ def addGUIItem( url, details, extraData, folder=True ):
     #Create the ListItem that will be displayed
     thumbPath=str(extraData.get('thumb',''))
     
-    addCounts = __settings__.getSetting('addCounts') == 'true'
-
     listItemName = details.get('title','Unknown')
-    if(addCounts and extraData.get("RecursiveItemCount") != None and extraData.get("RecursiveUnplayedItemCount") != None):
-       listItemName = listItemName + " (" + str(extraData.get("RecursiveItemCount") - extraData.get("RecursiveUnplayedItemCount")) + "/" + str(extraData.get("RecursiveItemCount")) + ")"
-    
-    list = xbmcgui.ListItem(listItemName, iconImage=thumbPath, thumbnailImage=thumbPath)
-    printDebug("Setting thumbnail as " + thumbPath, level=2)
     
     # calculate percentage
     cappedPercentage = None
@@ -556,19 +549,25 @@ def addGUIItem( url, details, extraData, folder=True ):
             if(cappedPercentage == 0):
                 cappedPercentage = 10
             if(cappedPercentage == 100):
-                cappedPercentage = 90
-            list.setProperty("complete_percentage", str(cappedPercentage))          
-     
-    # add resume percentage text to titles
+                cappedPercentage = 90    
+    
     addResumePercent = __settings__.getSetting('addResumePercent') == 'true'
     if (addResumePercent and details.get('title') != None and cappedPercentage != None):
-        details['title'] = details.get('title') + " (" + str(cappedPercentage) + "%)"
+        listItemName = listItemName + " (" + str(cappedPercentage) + "%)"   
     
-    #Set the properties of the item, such as summary, name, season, etc
-    #list.setInfo( type=extraData.get('type','Video'), infoLabels=details )
+    addCounts = __settings__.getSetting('addCounts') == 'true'
+    if(addCounts and extraData.get("RecursiveItemCount") != None and extraData.get("RecursiveUnplayedItemCount") != None):
+       listItemName = listItemName + " (" + str(extraData.get("RecursiveItemCount") - extraData.get("RecursiveUnplayedItemCount")) + "/" + str(extraData.get("RecursiveItemCount")) + ")"   
+ 
+    list = xbmcgui.ListItem(listItemName, iconImage=thumbPath, thumbnailImage=thumbPath)
+    printDebug("Setting thumbnail as " + thumbPath, level=2)
     
-    #For all end items    
-    if ( not folder):
+    # calculate percentage
+    if (cappedPercentage != None):
+        list.setProperty("complete_percentage", str(cappedPercentage))          
+         
+    #For all end items
+    if(not folder):
         #list.setProperty('IsPlayable', 'true')
         if extraData.get('type','video').lower() == "video":
             list.setProperty('TotalTime', str(extraData.get('duration')))