diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css
index 77c9580..4e6771d 100644
--- a/mopidy_musicbox_webclient/static/css/webclient.css
+++ b/mopidy_musicbox_webclient/static/css/webclient.css
@@ -205,7 +205,15 @@
     background-color: #fff;
 }
 
-#searchresults {
+#searchartists {
+    display: none;
+}
+
+#searchalbums {
+    display: none;
+}
+
+#searchtracks {
     display: none;
 }
 
diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html
index 29a7877..2798776 100644
--- a/mopidy_musicbox_webclient/static/index.html
+++ b/mopidy_musicbox_webclient/static/index.html
@@ -357,98 +357,98 @@
 </div>
 
 <div data-role="content" class="pane" id="searchpane">
-    <div class="">
-        <form>
-            <select id="selectSearchService"> <!-- data-native-menu="false"> <!-- multiple="multiple" data-native-menu="false">
-                <option data-placeholder="true">Choose services</option> -->
-            </select>
-            <input id="searchinput" class="span2" data-clear-btn="true"
-                   onkeypress="return searchPressed(event.keyCode);" id="appendedInputButton" type="text"/>
-            <button class="btn" type="button" onclick="return initSearch(event.value);">
-                Search!
-            </button>
-        </form>
+    <h4>Search</h4>
+
+    <div class="ui-grid pl-breakpoint">
+        <div class="ui-block">
+            <form>
+                <p>Search for artists, albums, or specific tracks.
+                <select id="selectSearchService"> <!-- data-native-menu="false"> <!-- multiple="multiple" data-native-menu="false">
+                    <option data-placeholder="true">Choose services</option> -->
+                </select>
+                <input id="searchinput" placeholder="Search term" class="span2" data-clear-btn="true"
+                       onkeypress="return searchPressed(event.keyCode);" id="appendedInputButton" type="text"/>
+                <button class="btn" type="button" onclick="return initSearch(event.value);">
+                    Search!
+                </button>
+            </form>
+        </div>
     </div>
 
-
-    <div id="searchresults">
-        <div class="ui-grid-a srch-breakpoint">
-            <div class="ui-block-a" id="searchartists">
-                <div data-role="listview" data-inset="true">
-                    <div data-role="header">
-                        <h4>Artists</h4>
-                    </div>
-                    <div data-role="content">
-                        <ul data-role="listview" id="artistresulttable"></ul>
-                    </div>
+    <div class="ui-grid-a srch-breakpoint">
+        <div class="ui-block-a" id="searchartists">
+            <div data-role="listview" data-inset="true">
+                <div data-role="header">
+                    <h4>Artists</h4>
                 </div>
-            </div>
-            <div class="ui-block-b" id="searchalbums">
-                <div data-role="listview" data-inset="true">
-                    <div data-role="header">
-                        <h4>Albums</h4>
-                    </div>
-                    <div data-role="content">
-                        <ul data-role="listview" id="albumresulttable"></ul>
-                    </div>
+                <div data-role="content">
+                    <ul data-role="listview" id="artistresulttable"></ul>
                 </div>
             </div>
         </div>
-
-        <div class="" id="searchtracks">
-            <h4>Tracks</h4>
-            <ul id="trackresulttable" class="table"></ul>
+        <div class="ui-block-b" id="searchalbums">
+            <div data-role="listview" data-inset="true">
+                <div data-role="header">
+                    <h4>Albums</h4>
+                </div>
+                <div data-role="content">
+                    <ul data-role="listview" id="albumresulttable"></ul>
+                </div>
+            </div>
         </div>
     </div>
+
+    <div class="" id="searchtracks">
+        <h4>Tracks</h4>
+        <ul id="trackresulttable" class="table"></ul>
+    </div>
 </div>
 <!-- search div -->
 
 <div data-role="content" class="pane" id="streampane">
     <h4>Streams</h4>
 
-    <div>
-        <div class="ui-grid-a pl-breakpoint">
+    <div class="ui-grid-a pl-breakpoint">
         <div class="ui-block-a" style="padding: 5px">
-        <form>
-            <p>Play a specific stream/track and optionally save it to your favourites.
-            <button class="btn" type="button" onclick="return getCurrentlyPlaying();">
-                Get currently playing
-            </button>
-            <input id="streamuriinput" placeholder="URI" class="span2" data-clear-btn="true"
-                   onkeypress="return streamPressed(event.keyCode);" id="appendedInputButton" type="text"/>
-            <button class="btn" type="button" onclick="return playStreamUri();">
-                Play
-            </button>
+            <form>
+                <p>Play a specific stream/track and optionally save it to your favourites.
+                <button class="btn" type="button" onclick="return getCurrentlyPlaying();">
+                    Get currently playing
+                </button>
+                <input id="streamuriinput" placeholder="URI" class="span2" data-clear-btn="true"
+                       onkeypress="return streamPressed(event.keyCode);" id="appendedInputButton" type="text"/>
+                <button class="btn" type="button" onclick="return playStreamUri();">
+                    Play
+                </button>
 
-            <input id="streamnameinput" placeholder="Name" class="span2" data-clear-btn="true"
-                   onkeypress="return streamPressed(event.keyCode);" id="appendedInputButton" type="text"/>
-            <button class="btn" type="button" onclick="return addFavourite();">
-                Save
-            </button>
-                <br/>
-        </form>
+                <input id="streamnameinput" placeholder="Name" class="span2" data-clear-btn="true"
+                       onkeypress="return streamPressed(event.keyCode);" id="appendedInputButton" type="text"/>
+                <button class="btn" type="button" onclick="return addFavourite();">
+                    Save
+                </button>
+                    <br/>
+            </form>
         </div>
         <div class="ui-block-b" style="padding: 5px">
             <ul id="streamuristable" class="table"></ul>
         </div>
-        </div>
     </div>
 </div>
 
 
 <div data-role="footer" data-tap-toggle="false" data-position="fixed" id="normalFooter">
-        <div class="footerControls">
-            <div id="songinfo" style="float: left">
-                <a href="#"><div><img id="infocover" src="images/default_cover.png"/></div></a>
-                <div class="songinfo-text">
-                    <div id="infoname"></div>
-                    <div id="infoartist"></div>
-                </div>
-            </div>
-            <div style="float: right;">
-                <a href="#" onclick="doPlay(); return false"><span id="btplay" title="Play"><i class="fa fa-play"></i></span></a>
+    <div class="footerControls">
+        <div id="songinfo" style="float: left">
+            <a href="#"><div><img id="infocover" src="images/default_cover.png"/></div></a>
+            <div class="songinfo-text">
+                <div id="infoname"></div>
+                <div id="infoartist"></div>
             </div>
         </div>
+        <div style="float: right;">
+            <a href="#" onclick="doPlay(); return false"><span id="btplay" title="Play"><i class="fa fa-play"></i></span></a>
+        </div>
+    </div>
 </div>
 <div data-role="footer" data-tap-toggle="false" data-position="fixed" id="nowPlayingFooter">
         <div class="footerControls" style="padding-left: 10px;">
diff --git a/mopidy_musicbox_webclient/static/js/library.js b/mopidy_musicbox_webclient/static/js/library.js
index 4ff0caf..3a62e05 100644
--- a/mopidy_musicbox_webclient/static/js/library.js
+++ b/mopidy_musicbox_webclient/static/js/library.js
@@ -27,7 +27,9 @@ function initSearch() {
         delete customTracklists[URI_SCHEME+':artistresultscache'];
         delete customTracklists[URI_SCHEME+':albumresultscache'];
         delete customTracklists[URI_SCHEME+':trackresultscache'];
-        $("#searchresults").hide();
+        $("#searchartists").hide();
+        $("#searchalbums").hide();
+        $("#searchtracks").hide();
 
         if (searchService != 'all') {
             mopidy.library.search({'query': {any:[value]}, 'uris': [searchService + ':']}).then(processSearchResults, console.error);
@@ -108,7 +110,17 @@ function processSearchResults(resultArr) {
         return false;
     }
 
-    $("#searchresults").show();
+    if (results.artists.length > 0) {
+        $("#searchartists").show();
+    }
+
+    if (results.albums.length > 0) {
+        $("#searchalbums").show();
+    }
+
+    if (results.tracks.length > 0) {
+        $("#searchtracks").show();
+    }
 
     // Returns a string where {x} in template is replaced by tokens[x].
     function theme(template, tokens) {
diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest
index 612636c..779e318 100644
--- a/mopidy_musicbox_webclient/static/mb.manifest
+++ b/mopidy_musicbox_webclient/static/mb.manifest
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 2016-01-31:v3
+# 2016-02-4:v1
 
 NETWORK:
 *