--- a/script.image.bigpictures/resources/lib/gui.py
+++ b/script.image.bigpictures/resources/lib/gui.py
@@ -16,42 +16,38 @@
 class GUI(xbmcgui.WindowXML):
     # Controls
     CONTROL_MAIN_IMAGE = 100
+    IMAGE_LOADING = 101
+    LABEL_VISIBLE = 102
     # Actions
     ACTION_CONTEXT_MENU = [117]
     ACTION_MENU = [122]
-    ACTION_PREVIOUS_MENU = [9]
+    ACTION_PREVIOUS_MENU = [9, 92, 10]
     ACTION_SHOW_INFO = [11]
-    ACTION_EXIT_SCRIPT = [10, 13]
+    ACTION_EXIT_SCRIPT = [13]
     ACTION_DOWN = [4]
     ACTION_UP = [3]
-    ACTION_0 = [58]
+    ACTION_0 = [58, 18]
+    ACTION_PLAY = [79]
 
     def __init__(self, xmlFilename, scriptPath, defaultSkin, defaultRes):
         self.getScraper()
 
     def getScraper(self):
         addon_path = xbmc.translatePath(Addon.getAddonInfo('path'))
-        print 'TBP: addon_path: %s' % repr(addon_path)
         res_path = os.path.join(addon_path, 'resources', 'lib')
-        print 'TBP: res_path: %s' % repr(res_path)
         scrapers_path = os.path.join(res_path, 'scrapers')
-        print 'TBP: scrapers_path: %s' % repr(scrapers_path)
         scrapers = [f[:-3] for f in os.listdir(scrapers_path) \
                     if f.endswith('.py')]
-        print 'TBP: scrapers: %s' % repr(scrapers)
         sys.path.insert(0, res_path)
         sys.path.insert(0, scrapers_path)
-        print 'TBP: path: %s' % repr(sys.path)
         imported_modules = [__import__(scraper) for scraper in scrapers]
-        print 'TBP: imported_modules: %s' % repr(imported_modules)
         self.SOURCES = [m.register() for m in imported_modules]
 
     def onInit(self):
-        self.show_info = 'true'
+        self.show_info = True
         self.active_source_id = 0
-        aspect_ratio_id = int(getSetting('aspect_ratio'))
-        aspect_ratios = ('scale', 'keep')
-        self.default_aspect = aspect_ratios[aspect_ratio_id]
+        aspect_ratio_id = int(getSetting('aspect_ratio2'))
+        self.default_aspect = ('scale', 'keep')[aspect_ratio_id]
         self.setSource()
         self.showAlbums()
         self.setFocus(self.getControl(self.CONTROL_MAIN_IMAGE))
@@ -84,6 +80,8 @@
             self.showAlbums()
         elif action in self.ACTION_0:
             self.toggleAspect()
+        elif action in self.ACTION_PLAY:
+            pass
 
     def onClick(self, controlId):
         if controlId == self.CONTROL_MAIN_IMAGE:
@@ -98,17 +96,13 @@
         return control.getSelectedItem().getProperty(property)
 
     def toggleInfo(self):
-        selectedControl = self.getControl(self.CONTROL_MAIN_IMAGE)
-        if self.getProperty('show_info') == 'false':
-            for i in range(selectedControl.size()):
-                selectedControl.getListItem(i).setProperty('show_info',
-                                                           'true')
-            self.show_info = 'true'
+        selectedControl = self.getControl(self.LABEL_VISIBLE)
+        if self.show_info:
+            selectedControl.setVisible(False)
+            self.show_info = False
         else:
-            for i in range(selectedControl.size()):
-                selectedControl.getListItem(i).setProperty('show_info',
-                                                           'false')
-            self.show_info = 'false'
+            selectedControl.setVisible(True)
+            self.show_info = True
 
     def toggleAspect(self):
         selectedControl = self.getControl(self.CONTROL_MAIN_IMAGE)
@@ -140,20 +134,23 @@
                 imageDownloader.Download(photos, downloadPath)
 
     def showPhotos(self):
+        self.getControl(self.IMAGE_LOADING).setVisible(True)
         link = self.getProperty('link')
         self.getControl(self.CONTROL_MAIN_IMAGE).reset()
         photos = self.Source.getPhotos(link)
         self.showItems(photos, 'photo')
+        self.getControl(self.IMAGE_LOADING).setVisible(False)
 
     def showAlbums(self):
+        self.getControl(self.IMAGE_LOADING).setVisible(True)
         self.getControl(self.CONTROL_MAIN_IMAGE).reset()
         albums = self.Source.getAlbums()
         self.showItems(albums, 'album')
+        self.getControl(self.IMAGE_LOADING).setVisible(False)
 
     def showItems(self, itemSet, type):
         total = len(itemSet)
         for i, item in enumerate(itemSet):
-            item['show_info'] = self.show_info
             item['type'] = type
             item['album'] = self.Source.NAME
             item['title'] = item['title']
@@ -189,4 +186,4 @@
     def showHelp(self):
         if not getSetting('help_already_shown'):
             openSettings()
-            setSetting('help_already_shown', 'yes')
+            setSetting('help_already_shown', 'yes')