diff --git a/modules/db-read/database-public-sqlite.js b/modules/db-read/database-public-sqlite.js
index c59d6e3..b8cd3d3 100644
--- a/modules/db-read/database-public-sqlite.js
+++ b/modules/db-read/database-public-sqlite.js
@@ -244,7 +244,7 @@ exports.setup = function (mstream, dbSettings){
     var albums = {"albums":[]};
 
     // TODO: Make a list of all songs without null albums and add them to the response
-    var sql = "SELECT DISTINCT album FROM items WHERE artist = ? AND user = ? ORDER BY album  COLLATE NOCASE ASC;";
+    var sql = "SELECT album, album_art_file FROM items WHERE artist = ? AND user = ? GROUP BY album ORDER BY album  COLLATE NOCASE ASC;";
     var searchTerms = [];
     searchTerms.push(req.body.artist);
     searchTerms.push(req.user.username);
@@ -256,11 +256,11 @@ exports.setup = function (mstream, dbSettings){
       }
 
       var returnArray = [];
-      for (var i = 0; i < rows.length; i++) {
-        if(rows[i].album){
+      for (let row in rows){
+        if(row.album){
           albums.albums.push({
-            name: rows[i].album,
-            album_art_file: rows[i].album_art_file
+            name: row.album,
+            album_art_file: row.album_art_file
           });
         }
       }
diff --git a/public/css/master.css b/public/css/master.css
index de673ee..9596c18 100755
--- a/public/css/master.css
+++ b/public/css/master.css
@@ -143,7 +143,7 @@ div#jp_container_N {
   font-weight: 300;
   border-bottom: solid 1px #b4b4b4;
   padding: 13px 10px; }
-  .filez:hover, .dirz:hover, .back:hover, .artistz:hover, .albumz:hover, .playlistz:hover, .playlist-item:hover #playlist_container ul li:hover {
+  .filez:hover, .back:hover, .artistz:hover,  .playlistz:hover, .playlist-item:hover #playlist_container ul li:hover {
     background-color: #F5F5F5; }
 
 .dirz {
@@ -192,7 +192,7 @@ div#jp_container_N {
     list-style-type: none;
     overflow: hidden; }
 
-.dirz:hover {
+.dirz:hover, .albumz:hover, .artistz:hover, .playlistz:hover {
   background-color: rgba(230, 154, 23, 0.15); }
 
 .back:hover {
@@ -513,3 +513,15 @@ h3 {
 .hover-fill:hover{
   opacity: 1;
 }
+
+.explorer-label-1{
+  font-family: 'Jura', sans-serif;
+
+  font-style: normal;
+  font-size: 17px;
+  line-height: 100%;
+}
+.album-art-box{
+  height: 50px;
+  margin-right: 10px;
+}
diff --git a/public/js/lib/lazy-load.js b/public/js/lib/lazy-load.js
new file mode 100644
index 0000000..0a6005f
--- /dev/null
+++ b/public/js/lib/lazy-load.js
@@ -0,0 +1 @@
+var _extends=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};!function(e,t){"object"===("undefined"==typeof exports?"undefined":_typeof(exports))&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.LazyLoad=t()}(this,function(){"use strict";var e={elements_selector:"img",container:window,threshold:300,throttle:150,data_src:"original",data_srcset:"original-set",class_loading:"loading",class_loaded:"loaded",class_error:"error",class_initial:"initial",skip_invisible:!0,callback_load:null,callback_error:null,callback_set:null,callback_processed:null},t=!("onscroll"in window)||/glebot/.test(navigator.userAgent),n=function(e,t){e&&e(t)},o=function(e){return e.getBoundingClientRect().top+window.pageYOffset-e.ownerDocument.documentElement.clientTop},i=function(e,t,n){return(t===window?window.innerHeight+window.pageYOffset:o(t)+t.offsetHeight)<=o(e)-n},s=function(e){return e.getBoundingClientRect().left+window.pageXOffset-e.ownerDocument.documentElement.clientLeft},r=function(e,t,n){var o=window.innerWidth;return(t===window?o+window.pageXOffset:s(t)+o)<=s(e)-n},l=function(e,t,n){return(t===window?window.pageYOffset:o(t))>=o(e)+n+e.offsetHeight},a=function(e,t,n){return(t===window?window.pageXOffset:s(t))>=s(e)+n+e.offsetWidth},c=function(e,t,n){return!(i(e,t,n)||l(e,t,n)||r(e,t,n)||a(e,t,n))},u=function(e,t){var n=new e(t),o=new CustomEvent("LazyLoad::Initialized",{detail:{instance:n}});window.dispatchEvent(o)},d=function(e,t){return e.getAttribute("data-"+t)},h=function(e,t,n){return e.setAttribute("data-"+t,n)},f=function(e,t){var n=e.parentElement;if("PICTURE"===n.tagName)for(var o=0;o<n.children.length;o++){var i=n.children[o];if("SOURCE"===i.tagName){var s=d(i,t);s&&i.setAttribute("srcset",s)}}},_=function(e,t,n){var o=e.tagName,i=d(e,n);if("IMG"===o){f(e,t);var s=d(e,t);return s&&e.setAttribute("srcset",s),void(i&&e.setAttribute("src",i))}"IFRAME"!==o?i&&(e.style.backgroundImage='url("'+i+'")'):i&&e.setAttribute("src",i)},p=!!document.body.classList,m=function(e,t){p?e.classList.add(t):e.className+=(e.className?" ":"")+t},g=function(e,t){p?e.classList.remove(t):e.className=e.className.replace(new RegExp("(^|\\s+)"+t+"(\\s+|$)")," ").replace(/^\s+/,"").replace(/\s+$/,"")},v=function(t){this._settings=_extends({},e,t),this._queryOriginNode=this._settings.container===window?document:this._settings.container,this._previousLoopTime=0,this._loopTimeout=null,this._boundHandleScroll=this.handleScroll.bind(this),this._isFirstLoop=!0,window.addEventListener("resize",this._boundHandleScroll),this.update()};v.prototype={_reveal:function(e){var t=this._settings,o=function o(){t&&(e.removeEventListener("load",i),e.removeEventListener("error",o),g(e,t.class_loading),m(e,t.class_error),n(t.callback_error,e))},i=function i(){t&&(g(e,t.class_loading),m(e,t.class_loaded),e.removeEventListener("load",i),e.removeEventListener("error",o),n(t.callback_load,e))};"IMG"!==e.tagName&&"IFRAME"!==e.tagName||(e.addEventListener("load",i),e.addEventListener("error",o),m(e,t.class_loading)),_(e,t.data_srcset,t.data_src),n(t.callback_set,e)},_loopThroughElements:function(){var e=this._settings,o=this._elements,i=o?o.length:0,s=void 0,r=[],l=this._isFirstLoop;for(s=0;s<i;s++){var a=o[s];e.skip_invisible&&null===a.offsetParent||(t||c(a,e.container,e.threshold))&&(l&&m(a,e.class_initial),this._reveal(a),r.push(s),h(a,"was-processed",!0))}for(;r.length;)o.splice(r.pop(),1),n(e.callback_processed,o.length);0===i&&this._stopScrollHandler(),l&&(this._isFirstLoop=!1)},_purgeElements:function(){var e=this._elements,t=e.length,n=void 0,o=[];for(n=0;n<t;n++){var i=e[n];d(i,"was-processed")&&o.push(n)}for(;o.length>0;)e.splice(o.pop(),1)},_startScrollHandler:function(){this._isHandlingScroll||(this._isHandlingScroll=!0,this._settings.container.addEventListener("scroll",this._boundHandleScroll))},_stopScrollHandler:function(){this._isHandlingScroll&&(this._isHandlingScroll=!1,this._settings.container.removeEventListener("scroll",this._boundHandleScroll))},handleScroll:function(){var e=this._settings.throttle;if(0!==e){var t=Date.now(),n=e-(t-this._previousLoopTime);n<=0||n>e?(this._loopTimeout&&(clearTimeout(this._loopTimeout),this._loopTimeout=null),this._previousLoopTime=t,this._loopThroughElements()):this._loopTimeout||(this._loopTimeout=setTimeout(function(){this._previousLoopTime=Date.now(),this._loopTimeout=null,this._loopThroughElements()}.bind(this),n))}else this._loopThroughElements()},update:function(){this._elements=Array.prototype.slice.call(this._queryOriginNode.querySelectorAll(this._settings.elements_selector)),this._purgeElements(),this._loopThroughElements(),this._startScrollHandler()},destroy:function(){window.removeEventListener("resize",this._boundHandleScroll),this._loopTimeout&&(clearTimeout(this._loopTimeout),this._loopTimeout=null),this._stopScrollHandler(),this._elements=null,this._queryOriginNode=null,this._settings=null}};var w=window.lazyLoadOptions;return w&&function(e,t){var n=t.length;if(n)for(var o=0;o<n;o++)u(e,t[o]);else u(e,t)}(v,w),v});
diff --git a/public/js/mstream.js b/public/js/mstream.js
index ec71024..be1ec36 100755
--- a/public/js/mstream.js
+++ b/public/js/mstream.js
@@ -569,11 +569,16 @@ $(document).ready(function(){
 			//parse through the json array and make an array of corresponding divs
 			var albums = [];
 			$.each(response.albums, function(index, value) {
-				albums.push('<div data-album="'+value.name+'" class="albumz">'+value.name+' </div>');
+        if(value.album_art_file){
+          albums.push('<div data-album="'+value.name+'" class="albumz"><img class="album-art-box"  data-original="album-art/'+value.album_art_file+'"><span class="explorer-label-1">'+value.name+'</span></div>');
+        }else{
+          albums.push('<div data-album="'+value.name+'" class="albumz"><img class="album-art-box" src="/public/img/default.png"><span class="explorer-label-1">'+value.name+'</span></div>');
+        }
         currentBrowsingList.push({type: 'album', name: value.name});
 			});
 
 			$('#filelist').html(albums);
+      ll.update();
     });
 	});
 
@@ -633,6 +638,7 @@ $(document).ready(function(){
 
 	$("#filelist").on('click', '.artistz', function() {
 		var artist = $(this).data('artist');
+    resetPanel('Artist', 'scrollBoxHeight1');
 
     MSTREAMAPI.artistAlbums(artist, function(response, error){
       $('#search_folders').val('');
@@ -641,18 +647,20 @@ $(document).ready(function(){
         return boilerplateFailure(response, error);
       }
       //clear the list
-    	$('#filelist').empty();
       currentBrowsingList = [];
 
     	var albums = [];
     	$.each(response.albums, function(index, value) {
-    		albums.push('<div data-album="'+value.name+'" class="albumz">'+value.name+' </div>');
+        if(value.album_art_file){
+          albums.push('<div data-album="'+value.name+'" class="albumz"><img class="album-art-box"  data-original="album-art/'+value.album_art_file+'"><span class="explorer-label-1">'+value.name+'</span></div>');
+        }else{
+          albums.push('<div data-album="'+value.name+'" class="albumz"><img class="album-art-box" src="/public/img/default.png"><span class="explorer-label-1">'+value.name+'</span></div>');
+        }
         currentBrowsingList.push({type: 'album', name: value.name})
     	});
 
     	$('#filelist').html(albums);
-    	$('.panel_one_name').html('Albums');
-      $('.directoryName').html('Artist: ' + artist);
+      ll.update();
     });
 	});
 
diff --git a/public/mstream.html b/public/mstream.html
index b8fe581..05fed07 100755
--- a/public/mstream.html
+++ b/public/mstream.html
@@ -376,4 +376,11 @@
     $(document).foundation();
   </script>
 
+  <script type="text/javascript" src="/public/js/lib/lazy-load.js"></script>
+  <script>
+  var ll =new LazyLoad({
+     container: document.getElementById('filelist')
+  });
+  </script>
+
 </body>