diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index 3c9bd1f1af..e7222338dc 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -190,6 +190,14 @@
         self.seek = function (position) {
             self.changeStream(position);
         };
+
+        self.currentPlaylistIndex = function (i) {
+            self.currentPlaylistIndex(i);
+        };
+
+        self.removeFromPlaylist = function (i) {
+            self.removeFromPlaylist(i);
+        };
     }
 
     window.MediaController = new mediaController();
diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js
index 523835ba29..003e046761 100644
--- a/dashboard-ui/scripts/musicalbums.js
+++ b/dashboard-ui/scripts/musicalbums.js
@@ -34,7 +34,8 @@
                     shape: "square",
                     context: 'music',
                     showTitle: true,
-                    showParentTitle: true
+                    showParentTitle: true,
+                    lazy: true
                 });
                 $('.itemsContainer', page).removeClass('timelineItemsContainer');
             }
@@ -45,7 +46,8 @@
                     context: 'music',
                     showTitle: true,
                     showParentTitle: true,
-                    timeline: true
+                    timeline: true,
+                    lazy: true
                 });
                 $('.itemsContainer', page).addClass('timelineItemsContainer');
             }
diff --git a/dashboard-ui/scripts/playlist.js b/dashboard-ui/scripts/playlist.js
index 187767152d..10c6b2d9bf 100644
--- a/dashboard-ui/scripts/playlist.js
+++ b/dashboard-ui/scripts/playlist.js
@@ -65,14 +65,14 @@
 
             var index = parseInt(this.getAttribute('data-index'));
 
-            MediaPlayer.currentPlaylistIndex(index);
+            MediaController.currentPlaylistIndex(index);
             reloadPlaylist(page);
 
         }).on('click', '.lnkRemove', function () {
 
             var index = parseInt(this.getAttribute('data-index'));
 
-            MediaPlayer.removeFromPlaylist(index);
+            MediaController.removeFromPlaylist(index);
             reloadPlaylist(page);
         });