diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..378eac25d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cce24fec3..410a7263e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ file(GLOB RESOURCES
     htdocs/assets/*
     htdocs/css/*.css
     htdocs/fonts/*
+	htdocs/img/*
     htdocs/index.html
 )
 
diff --git a/README.md b/README.md
index 08ef76d64..5337b94fd 100644
--- a/README.md
+++ b/README.md
@@ -31,10 +31,26 @@ Usage: ./ympd [OPTION]...
  -h, --host <host>          connect to mpd at host [localhost]
  -p, --port <port>          connect to mpd at port [6600]
  -w, --webport [ip:]<port>  listen interface/port for webserver [8080]
+ -a, --artwork [url template] for artwork fetch
  -u, --user <username>      drop priviliges to user after socket bind
  -V, --version              get version
  --help                     this help
 ```
+Artwork
+-------
+Provide a template where the artwork may be fetched from:
+```
+ http://server/music/%A/%a/cover.jpg
+```
+The available substitutions are:
+```
+ %A - Artist
+ %a - Album
+ %T - Title
+ %t - track
+ %P - Path to track (dirname)
+ %% - %
+```
 
 SSL Support
 -----------
diff --git a/htdocs/css/dragula.min.css b/htdocs/css/dragula.min.css
new file mode 100644
index 000000000..cdcb2bc74
--- /dev/null
+++ b/htdocs/css/dragula.min.css
@@ -0,0 +1 @@
+.gu-mirror{position:fixed!important;margin:0!important;z-index:9999!important;opacity:.8;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";filter:alpha(opacity=80)}.gu-hide{display:none!important}.gu-unselectable{-webkit-user-select:none!important;-moz-user-select:none!important;-ms-user-select:none!important;user-select:none!important}.gu-transit{opacity:.2;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";filter:alpha(opacity=20)}
\ No newline at end of file
diff --git a/htdocs/css/mpd.css b/htdocs/css/mpd.css
index 647bfc707..2a7dd3114 100644
--- a/htdocs/css/mpd.css
+++ b/htdocs/css/mpd.css
@@ -1,6 +1,16 @@
 body {
   padding-top: 50px;
   padding-bottom: 50px;
+  background-color: #ddccdd;
+}
+
+.panel {
+	background-color: #ffffee;
+    box-shadow: 5px 5px 5px #888888;
+}
+
+.quicknav-btn {
+    background-color: #428bca;
 }
 
 .starter-template {
@@ -32,6 +42,17 @@ body {
   margin-right: -10px;
 }
 
+.queue-track {
+  cursor: move;
+  cursor: -webkit-grab;
+}
+
+#artwork {
+    width: 100px;
+    height: 100px;
+    border: 1px solid #cccccc;
+}
+
 .btn-group-hover {
     opacity: 20%;
 }
@@ -88,3 +109,16 @@ td:last-child, td:first-child {
 button {
   overflow: hidden;
 }
+
+#welcome {
+	margin: 20px;
+	padding: 5px;
+	border: 1px solid #ddccdd;
+}
+
+.stats {
+	padding: 5px;
+	display: inline-block;
+	margin: 0px;
+}
+
diff --git a/htdocs/img/cover.jpg b/htdocs/img/cover.jpg
new file mode 100644
index 000000000..74ee50973
Binary files /dev/null and b/htdocs/img/cover.jpg differ
diff --git a/htdocs/index.html b/htdocs/index.html
index ed77279a3..1232d1a5c 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -12,6 +12,8 @@
   <!-- Bootstrap core CSS -->
   <link href="css/bootstrap.css" rel="stylesheet">
   <link href="css/bootstrap-theme.css" rel="stylesheet">
+  <!-- Dragula -->
+  <link href="css/dragula.min.css" rel="stylesheet">
 
   <!-- Custom styles for this template -->
   <link href="css/mpd.css" rel="stylesheet">
@@ -33,9 +35,8 @@
       <div class="collapse navbar-collapse">
 
         <ul id="nav_links" class="nav navbar-nav">
-          <li id="queue"><a href="#/">Queue</a></li>
-          <li id="browse"><a href="#/browse/0/">Browse database</a></li>
-          <li id="dirble"><a href="#/dirble/">Dirble</a></li>
+          <li id="queue"><a href="#/0">Queue</a></li>
+          <li id="browse"><a href="#/browse/0/">Browse</a></li>
           <li><a href="#" data-toggle="modal" data-target="#addstream">Add Stream</a></li>
           <li><a href="#" data-toggle="modal" data-target="#settings" onclick="getHost();">Settings</a></li>
         </ul>
@@ -82,6 +83,9 @@
           <div class="panel-heading"><b id="panel-heading">Queue</b></div>
           <div class="panel-body">
             <h1>
+                <span>
+                    <img id="artwork" src="img/cover.jpg" />
+                </span>
               <span id="track-icon" onclick="clickPlay();" class="glyphicon glyphicon-play"></span>
               <span id="currenttrack"></span>
             </h1>
@@ -96,6 +100,19 @@ <h4>
 
           </div><!-- /.panel-body -->
 
+		  <div id="quicknav" class="hide">
+			<button type="button" class="btn quicknav-btn">A-C</button>
+			<button type="button" class="btn quicknav-btn">D-F</button>
+			<button type="button" class="btn quicknav-btn">G-I</button>
+			<button type="button" class="btn quicknav-btn">J-L</button>
+			<button type="button" class="btn quicknav-btn">M-O</button>
+			<button type="button" class="btn quicknav-btn">P-R</button>
+			<button type="button" class="btn quicknav-btn">S-U</button>
+			<button type="button" class="btn quicknav-btn">V-X</button>
+			<button type="button" class="btn quicknav-btn">Y-Z</button>
+			<button type="button" class="btn quicknav-btn">Playlists</button>
+		  </div>
+
           <ol id="breadcrump" class="breadcrumb">
           </ol>
 
@@ -118,27 +135,14 @@ <h4>
             </tbody>
           </table>
 
-          <div id="dirble_panel">
-            <p id="dirble_loading" style="font-size:16px;font-weight:bold;margin-left:4em;">Loading...</p>
-            <table style="float:right; width:44%; margin-right:4%;" id="dirble_right" class="table table-hover">
-                <thead>
-                <tr>
-                    <th></th>
-                </tr>
-                </thead>
-                <tbody>
-                </tbody>
-            </table>
-            <table style="width:44%; margin-left:4%;" id="dirble_left" class="table table-hover">
-                <thead>
-                <tr>
-                    <th></th>
-                </tr>
-                </thead>
-                <tbody>
-                </tbody>
-            </table>
-        </div>
+		<!-- Welcome page -->
+		<div id="welcome">
+			<div><span class="stats">Artists</span><span id="stat_artists" class="stats"></span></div>
+			<div><span class="stats">Albums</span><span id="stat_albums" class="stats"></span></div>
+			<div><span class="stats">Songs</span><span id="stat_songs" class="stats"></span></div>
+			<div><span class="stats">Total play time</span><span id="stat_ttime" class="stats"></span></div>
+			<div><span class="stats">Last DB update</span><span id="stat_update" class="stats"></span></div>
+		</div>
 
         </div><!-- /.panel -->
         <ul class="pager">
@@ -170,7 +174,7 @@ <h4>
           </div>
 
           <div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg">
-            <button type="button" class="btn btn-default" onclick="socket.send('MPD_API_RM_ALL');">
+            <button type="button" class="btn btn-default" onclick="clearPlaylist();">
               <span class="glyphicon glyphicon-trash"></span> Clear queue
             </button>
             <a href="#" data-toggle="modal" data-target="#savequeue" class="btn btn-default">
@@ -329,6 +333,7 @@ <h1>Searching...</h1>
   <script src="js/bootstrap-notify.js"></script>
   <script src="js/bootstrap-slider.js"></script>
   <script src="js/sammy.js"></script>
+  <script src="js/dragula.min.js"></script>
   <script src="js/mpd.js"></script>
 </body>
 </html>
diff --git a/htdocs/js/dragula.min.js b/htdocs/js/dragula.min.js
new file mode 100644
index 000000000..b7860b973
--- /dev/null
+++ b/htdocs/js/dragula.min.js
@@ -0,0 +1 @@
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n;n="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,n.dragula=e()}}(function(){return function e(n,t,r){function o(u,c){if(!t[u]){if(!n[u]){var a="function"==typeof require&&require;if(!c&&a)return a(u,!0);if(i)return i(u,!0);var f=new Error("Cannot find module '"+u+"'");throw f.code="MODULE_NOT_FOUND",f}var l=t[u]={exports:{}};n[u][0].call(l.exports,function(e){var t=n[u][1][e];return o(t?t:e)},l,l.exports,e,n,t,r)}return t[u].exports}for(var i="function"==typeof require&&require,u=0;u<r.length;u++)o(r[u]);return o}({1:[function(e,n,t){"use strict";function r(e){var n=u[e];return n?n.lastIndex=0:u[e]=n=new RegExp(c+e+a,"g"),n}function o(e,n){var t=e.className;t.length?r(n).test(t)||(e.className+=" "+n):e.className=n}function i(e,n){e.className=e.className.replace(r(n)," ").trim()}var u={},c="(?:^|\\s)",a="(?:\\s|$)";n.exports={add:o,rm:i}},{}],2:[function(e,n,t){(function(t){"use strict";function r(e,n){function t(e){return-1!==le.containers.indexOf(e)||fe.isContainer(e)}function r(e){var n=e?"remove":"add";o(S,n,"mousedown",O),o(S,n,"mouseup",L)}function c(e){var n=e?"remove":"add";o(S,n,"mousemove",N)}function m(e){var n=e?"remove":"add";w[n](S,"selectstart",C),w[n](S,"click",C)}function h(){r(!0),L({})}function C(e){ce&&e.preventDefault()}function O(e){ne=e.clientX,te=e.clientY;var n=1!==i(e)||e.metaKey||e.ctrlKey;if(!n){var t=e.target,r=T(t);r&&(ce=r,c(),"mousedown"===e.type&&(p(t)?t.focus():e.preventDefault()))}}function N(e){if(ce){if(0===i(e))return void L({});if(void 0===e.clientX||e.clientX!==ne||void 0===e.clientY||e.clientY!==te){if(fe.ignoreInputTextSelection){var n=y("clientX",e),t=y("clientY",e),r=x.elementFromPoint(n,t);if(p(r))return}var o=ce;c(!0),m(),D(),B(o);var a=u(W);Z=y("pageX",e)-a.left,ee=y("pageY",e)-a.top,E.add(ie||W,"gu-transit"),K(),U(e)}}}function T(e){if(!(le.dragging&&J||t(e))){for(var n=e;v(e)&&t(v(e))===!1;){if(fe.invalid(e,n))return;if(e=v(e),!e)return}var r=v(e);if(r&&!fe.invalid(e,n)){var o=fe.moves(e,r,n,g(e));if(o)return{item:e,source:r}}}}function X(e){return!!T(e)}function Y(e){var n=T(e);n&&B(n)}function B(e){$(e.item,e.source)&&(ie=e.item.cloneNode(!0),le.emit("cloned",ie,e.item,"copy")),Q=e.source,W=e.item,re=oe=g(e.item),le.dragging=!0,le.emit("drag",W,Q)}function P(){return!1}function D(){if(le.dragging){var e=ie||W;M(e,v(e))}}function I(){ce=!1,c(!0),m(!0)}function L(e){if(I(),le.dragging){var n=ie||W,t=y("clientX",e),r=y("clientY",e),o=a(J,t,r),i=q(o,t,r);i&&(ie&&fe.copySortSource||!ie||i!==Q)?M(n,i):fe.removeOnSpill?R():A()}}function M(e,n){var t=v(e);ie&&fe.copySortSource&&n===Q&&t.removeChild(W),k(n)?le.emit("cancel",e,Q,Q):le.emit("drop",e,n,Q,oe),j()}function R(){if(le.dragging){var e=ie||W,n=v(e);n&&n.removeChild(e),le.emit(ie?"cancel":"remove",e,n,Q),j()}}function A(e){if(le.dragging){var n=arguments.length>0?e:fe.revertOnSpill,t=ie||W,r=v(t),o=k(r);o===!1&&n&&(ie?r.removeChild(ie):Q.insertBefore(t,re)),o||n?le.emit("cancel",t,Q,Q):le.emit("drop",t,r,Q,oe),j()}}function j(){var e=ie||W;I(),z(),e&&E.rm(e,"gu-transit"),ue&&clearTimeout(ue),le.dragging=!1,ae&&le.emit("out",e,ae,Q),le.emit("dragend",e),Q=W=ie=re=oe=ue=ae=null}function k(e,n){var t;return t=void 0!==n?n:J?oe:g(ie||W),e===Q&&t===re}function q(e,n,r){function o(){var o=t(i);if(o===!1)return!1;var u=H(i,e),c=V(i,u,n,r),a=k(i,c);return a?!0:fe.accepts(W,i,Q,c)}for(var i=e;i&&!o();)i=v(i);return i}function U(e){function n(e){le.emit(e,f,ae,Q)}function t(){s&&n("over")}function r(){ae&&n("out")}if(J){e.preventDefault();var o=y("clientX",e),i=y("clientY",e),u=o-Z,c=i-ee;J.style.left=u+"px",J.style.top=c+"px";var f=ie||W,l=a(J,o,i),d=q(l,o,i),s=null!==d&&d!==ae;(s||null===d)&&(r(),ae=d,t());var p=v(f);if(d===Q&&ie&&!fe.copySortSource)return void(p&&p.removeChild(f));var m,h=H(d,l);if(null!==h)m=V(d,h,o,i);else{if(fe.revertOnSpill!==!0||ie)return void(ie&&p&&p.removeChild(f));m=re,d=Q}(null===m&&s||m!==f&&m!==g(f))&&(oe=m,d.insertBefore(f,m),le.emit("shadow",f,d,Q))}}function _(e){E.rm(e,"gu-hide")}function F(e){le.dragging&&E.add(e,"gu-hide")}function K(){if(!J){var e=W.getBoundingClientRect();J=W.cloneNode(!0),J.style.width=d(e)+"px",J.style.height=s(e)+"px",E.rm(J,"gu-transit"),E.add(J,"gu-mirror"),fe.mirrorContainer.appendChild(J),o(S,"add","mousemove",U),E.add(fe.mirrorContainer,"gu-unselectable"),le.emit("cloned",J,W,"mirror")}}function z(){J&&(E.rm(fe.mirrorContainer,"gu-unselectable"),o(S,"remove","mousemove",U),v(J).removeChild(J),J=null)}function H(e,n){for(var t=n;t!==e&&v(t)!==e;)t=v(t);return t===S?null:t}function V(e,n,t,r){function o(){var n,o,i,u=e.children.length;for(n=0;u>n;n++){if(o=e.children[n],i=o.getBoundingClientRect(),c&&i.left+i.width/2>t)return o;if(!c&&i.top+i.height/2>r)return o}return null}function i(){var e=n.getBoundingClientRect();return u(c?t>e.left+d(e)/2:r>e.top+s(e)/2)}function u(e){return e?g(n):n}var c="horizontal"===fe.direction,a=n!==e?i():o();return a}function $(e,n){return"boolean"==typeof fe.copy?fe.copy:fe.copy(e,n)}var G=arguments.length;1===G&&Array.isArray(e)===!1&&(n=e,e=[]);var J,Q,W,Z,ee,ne,te,re,oe,ie,ue,ce,ae=null,fe=n||{};void 0===fe.moves&&(fe.moves=l),void 0===fe.accepts&&(fe.accepts=l),void 0===fe.invalid&&(fe.invalid=P),void 0===fe.containers&&(fe.containers=e||[]),void 0===fe.isContainer&&(fe.isContainer=f),void 0===fe.copy&&(fe.copy=!1),void 0===fe.copySortSource&&(fe.copySortSource=!1),void 0===fe.revertOnSpill&&(fe.revertOnSpill=!1),void 0===fe.removeOnSpill&&(fe.removeOnSpill=!1),void 0===fe.direction&&(fe.direction="vertical"),void 0===fe.ignoreInputTextSelection&&(fe.ignoreInputTextSelection=!0),void 0===fe.mirrorContainer&&(fe.mirrorContainer=x.body);var le=b({containers:fe.containers,start:Y,end:D,cancel:A,remove:R,destroy:h,canMove:X,dragging:!1});return fe.removeOnSpill===!0&&le.on("over",_).on("out",F),r(),le}function o(e,n,r,o){var i={mouseup:"touchend",mousedown:"touchstart",mousemove:"touchmove"},u={mouseup:"pointerup",mousedown:"pointerdown",mousemove:"pointermove"},c={mouseup:"MSPointerUp",mousedown:"MSPointerDown",mousemove:"MSPointerMove"};t.navigator.pointerEnabled?w[n](e,u[r],o):t.navigator.msPointerEnabled?w[n](e,c[r],o):(w[n](e,i[r],o),w[n](e,r,o))}function i(e){if(void 0!==e.touches)return e.touches.length;if(void 0!==e.which&&0!==e.which)return e.which;if(void 0!==e.buttons)return e.buttons;var n=e.button;return void 0!==n?1&n?1:2&n?3:4&n?2:0:void 0}function u(e){var n=e.getBoundingClientRect();return{left:n.left+c("scrollLeft","pageXOffset"),top:n.top+c("scrollTop","pageYOffset")}}function c(e,n){return"undefined"!=typeof t[n]?t[n]:S.clientHeight?S[e]:x.body[e]}function a(e,n,t){var r,o=e||{},i=o.className;return o.className+=" gu-hide",r=x.elementFromPoint(n,t),o.className=i,r}function f(){return!1}function l(){return!0}function d(e){return e.width||e.right-e.left}function s(e){return e.height||e.bottom-e.top}function v(e){return e.parentNode===x?null:e.parentNode}function p(e){return"INPUT"===e.tagName||"TEXTAREA"===e.tagName||"SELECT"===e.tagName||m(e)}function m(e){return e?"false"===e.contentEditable?!1:"true"===e.contentEditable?!0:m(v(e)):!1}function g(e){function n(){var n=e;do n=n.nextSibling;while(n&&1!==n.nodeType);return n}return e.nextElementSibling||n()}function h(e){return e.targetTouches&&e.targetTouches.length?e.targetTouches[0]:e.changedTouches&&e.changedTouches.length?e.changedTouches[0]:e}function y(e,n){var t=h(n),r={pageX:"clientX",pageY:"clientY"};return e in r&&!(e in t)&&r[e]in t&&(e=r[e]),t[e]}var b=e("contra/emitter"),w=e("crossvent"),E=e("./classes"),x=document,S=x.documentElement;n.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./classes":1,"contra/emitter":4,crossvent:8}],3:[function(e,n,t){"use strict";var r=e("ticky");n.exports=function(e,n,t){e&&r(function(){e.apply(t||null,n||[])})}},{ticky:6}],4:[function(e,n,t){"use strict";var r=e("atoa"),o=e("./debounce");n.exports=function(e,n){var t=n||{},i={};return void 0===e&&(e={}),e.on=function(n,t){return i[n]?i[n].push(t):i[n]=[t],e},e.once=function(n,t){return t._once=!0,e.on(n,t),e},e.off=function(n,t){var r=arguments.length;if(1===r)delete i[n];else if(0===r)i={};else{var o=i[n];if(!o)return e;o.splice(o.indexOf(t),1)}return e},e.emit=function(){var n=r(arguments);return e.emitterSnapshot(n.shift()).apply(this,n)},e.emitterSnapshot=function(n){var u=(i[n]||[]).slice(0);return function(){var i=r(arguments),c=this||e;if("error"===n&&t["throws"]!==!1&&!u.length)throw 1===i.length?i[0]:i;return u.forEach(function(r){t.async?o(r,i,c):r.apply(c,i),r._once&&e.off(n,r)}),e}},e}},{"./debounce":3,atoa:5}],5:[function(e,n,t){n.exports=function(e,n){return Array.prototype.slice.call(e,n)}},{}],6:[function(e,n,t){var r,o="function"==typeof setImmediate;r=o?function(e){setImmediate(e)}:function(e){setTimeout(e,0)},n.exports=r},{}],7:[function(e,n,t){(function(e){function t(){try{var e=new r("cat",{detail:{foo:"bar"}});return"cat"===e.type&&"bar"===e.detail.foo}catch(n){}return!1}var r=e.CustomEvent;n.exports=t()?r:"function"==typeof document.createEvent?function(e,n){var t=document.createEvent("CustomEvent");return n?t.initCustomEvent(e,n.bubbles,n.cancelable,n.detail):t.initCustomEvent(e,!1,!1,void 0),t}:function(e,n){var t=document.createEventObject();return t.type=e,n?(t.bubbles=Boolean(n.bubbles),t.cancelable=Boolean(n.cancelable),t.detail=n.detail):(t.bubbles=!1,t.cancelable=!1,t.detail=void 0),t}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],8:[function(e,n,t){(function(t){"use strict";function r(e,n,t,r){return e.addEventListener(n,t,r)}function o(e,n,t){return e.attachEvent("on"+n,f(e,n,t))}function i(e,n,t,r){return e.removeEventListener(n,t,r)}function u(e,n,t){var r=l(e,n,t);return r?e.detachEvent("on"+n,r):void 0}function c(e,n,t){function r(){var e;return p.createEvent?(e=p.createEvent("Event"),e.initEvent(n,!0,!0)):p.createEventObject&&(e=p.createEventObject()),e}function o(){return new s(n,{detail:t})}var i=-1===v.indexOf(n)?o():r();e.dispatchEvent?e.dispatchEvent(i):e.fireEvent("on"+n,i)}function a(e,n,r){return function(n){var o=n||t.event;o.target=o.target||o.srcElement,o.preventDefault=o.preventDefault||function(){o.returnValue=!1},o.stopPropagation=o.stopPropagation||function(){o.cancelBubble=!0},o.which=o.which||o.keyCode,r.call(e,o)}}function f(e,n,t){var r=l(e,n,t)||a(e,n,t);return h.push({wrapper:r,element:e,type:n,fn:t}),r}function l(e,n,t){var r=d(e,n,t);if(r){var o=h[r].wrapper;return h.splice(r,1),o}}function d(e,n,t){var r,o;for(r=0;r<h.length;r++)if(o=h[r],o.element===e&&o.type===n&&o.fn===t)return r}var s=e("custom-event"),v=e("./eventmap"),p=t.document,m=r,g=i,h=[];t.addEventListener||(m=o,g=u),n.exports={add:m,remove:g,fabricate:c}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./eventmap":9,"custom-event":7}],9:[function(e,n,t){(function(e){"use strict";var t=[],r="",o=/^on/;for(r in e)o.test(r)&&t.push(r.slice(2));n.exports=t}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}]},{},[2])(2)});
\ No newline at end of file
diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js
index 6000b7956..4589e8d95 100644
--- a/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@ -21,13 +21,11 @@ var last_state;
 var last_outputs;
 var current_app;
 var pagination = 0;
+var rootPagination = 0;
 var browsepath;
 var lastSongTitle = "";
 var current_song = new Object();
-var MAX_ELEMENTS_PER_PAGE = 512;
-var dirble_selected_cat = "";
-var dirble_catid = "";
-var dirble_page = 1;
+var MAX_ELEMENTS_PER_PAGE = 50;
 var isTouch = Modernizr.touch ? 1 : 0;
 
 var app = $.sammy(function() {
@@ -35,9 +33,10 @@ var app = $.sammy(function() {
     function runBrowse() {
         current_app = 'queue';
 
+		$('#welcome').addClass('hide');
+		$('#quicknav').addClass('hide');
         $('#breadcrump').addClass('hide');
         $('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove();
-        $('#dirble_panel').addClass('hide');
         socket.send('MPD_API_GET_QUEUE,'+pagination);
 
         $('#panel-heading').text("Queue");
@@ -48,6 +47,7 @@ var app = $.sammy(function() {
         $('#nav_links > li').removeClass('active');
         $('.page-btn').addClass('hide');
         $('#add-all-songs').hide();
+        $('#search > div > input').val('');
         pagination = 0;
         browsepath = '';
     }
@@ -62,22 +62,35 @@ var app = $.sammy(function() {
         prepare();
         browsepath = this.params['splat'][1];
         pagination = parseInt(this.params['splat'][0]);
+		if (!browsepath || browsepath.length == 0) {
+			rootPagination = pagination;
+		}
         current_app = 'browse';
-        $('#breadcrump').removeClass('hide').empty().append("<li><a href=\"#/browse/0/\">root</a></li>");
+		$('#welcome').addClass('hide');
+		$('#browse').addClass('active');
+		if (browsepath && !browsepath.match(/\[[A-Z-]{3}\]/)) {
+			$('#quicknav').addClass('hide');
+		} else {
+			$('#quicknav').removeClass('hide');
+		}
+        $('#breadcrump').removeClass('hide').empty().append("<li><a href=\"#/browse/" + rootPagination + "/\">root</a></li>");
         $('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove();
-        $('#dirble_panel').addClass('hide');
         socket.send('MPD_API_GET_BROWSE,'+pagination+','+(browsepath ? browsepath : "/"));
         // Don't add all songs from root
-        if (browsepath) {
+        if (browsepath && !browsepath.match(/\[[A-Z-]{3}\]/)) {
             var add_all_songs = $('#add-all-songs');
             add_all_songs.off(); // remove previous binds
             add_all_songs.on('click', function() {
                 socket.send('MPD_API_ADD_TRACK,'+browsepath);
+				$('.top-right').notify({
+					message:{
+						text: browsepath + ' added'
+				}}).show();
             });
             add_all_songs.show();
         }
 
-        $('#panel-heading').text("Browse database: "+browsepath);
+        $('#panel-heading').text("Browse: "+browsepath);
         var path_array = browsepath.split('/');
         var full_path = "";
         $.each(path_array, function(index, chunk) {
@@ -90,13 +103,16 @@ var app = $.sammy(function() {
             $('#breadcrump').append("<li><a href=\"#/browse/0/" + full_path + "\">"+chunk+"</a></li>");
             full_path += "/";
         });
-        $('#browse').addClass('active');
     });
 
     this.get(/\#\/search\/(.*)/, function() {
         current_app = 'search';
+        $('#nav_links > li').removeClass('active');
+		$('#quicknav').addClass('hide');
+		$('#welcome').addClass('hide');
+        $('#breadcrump').removeClass('hide').empty().append("<li>Search Results</li>");
+        $('#salamisandwich').removeClass('hide');
         $('#salamisandwich').find("tr:gt(0)").remove();
-        $('#dirble_panel').addClass('hide');
         var searchstr = this.params['splat'][0];
 
         $('#search > div > input').val(searchstr);
@@ -105,50 +121,14 @@ var app = $.sammy(function() {
         $('#panel-heading').text("Search: "+searchstr);
     });
 
-
-    this.get(/\#\/dirble\/(\d+)\/(\d+)/, function() {
-        prepare();
-        current_app = 'dirble';
-        $('#breadcrump').removeClass('hide').empty().append("<li><a href=\"#/dirble/\">Categories</a></li><li>"+dirble_selected_cat+"</li>");
-        $('#salamisandwich').addClass('hide');
-        $('#dirble_panel').removeClass('hide');
-        $('#dirble_loading').removeClass('hide');
-        $('#dirble_left').find("tr:gt(0)").remove();
-        $('#dirble_right').find("tr:gt(0)").remove();
-
-        $('#panel-heading').text("Dirble");
-        $('#dirble').addClass('active');
-
-        $('#next').addClass('hide');
-
-        if (this.params['splat'][1] > 1) $('#prev').removeClass('hide');
-        else $('#prev').addClass('hide');
-
-        dirble_catid = this.params['splat'][0];
-        dirble_page = this.params['splat'][1];
-
-        dirble_load_stations();
-    });
-
-
-    this.get(/\#\/dirble\//, function() {
-        prepare();
-        current_app = 'dirble';
-        $('#breadcrump').removeClass('hide').empty().append("<li>Categories</li>");
-        $('#salamisandwich').addClass('hide');
-        $('#dirble_panel').removeClass('hide');
-        $('#dirble_loading').removeClass('hide');
-        $('#dirble_left').find("tr:gt(0)").remove();
-        $('#dirble_right').find("tr:gt(0)").remove();
-
-        $('#panel-heading').text("Dirble");
-        $('#dirble').addClass('active');
-
-        dirble_load_categories();
-    });
-
     this.get("/", function(context) {
-        context.redirect("#/0");
+		prepare();
+		current_app = 'welcome';
+		$('#quicknav').addClass('hide');
+		$('#salamisandwich').addClass('hide');
+		$('#welcome').removeClass('hide');
+		$('#breadcrump').removeClass('hide').empty().append("<li>Welcome</li>");
+        socket.send('MPD_API_GET_STATS');
     });
 });
 
@@ -178,6 +158,33 @@ $(document).ready(function(){
     else
         if ($.cookie("notification") === "true")
             $('#btnnotify').addClass("active")
+
+	var vampire = dragula({
+		moves: function(el, source, handle, sibling) {
+			if(current_app == 'queue') {
+				return true;
+			} else {
+				return false;
+			}
+		}
+	});
+	vampire.containers.push($('#salamisandwich > tbody')[0]);
+	vampire.on('drop', function(el, target, source, sibling) {
+		var moveFrom = el.firstChild.textContent - 1;
+		var moveTo = target.children.length - 1;
+		if(sibling) {
+			moveTo = sibling.firstChild.textContent - 1;
+			if(moveTo > moveFrom) {
+				moveTo--;
+			}
+		}
+		if(moveTo < 0) {
+			moveTo = 0;
+		}
+		socket.send('MPD_API_MOVE_TRACK,'+moveFrom+','+moveTo);
+	});
+
+	console.log('ready');
 });
 
 
@@ -219,18 +226,20 @@ function webSocketConnect() {
 
                         $('#salamisandwich > tbody').append(
                             "<tr trackid=\"" + obj.data[song].id + "\"><td>" + (obj.data[song].pos + 1) + "</td>" +
-                                "<td>"+ obj.data[song].title +"</td>" + 
+                                "<td>"+ obj.data[song].title + " / " + obj.data[song].artist + "</td>" + 
                                 "<td>"+ minutes + ":" + (seconds < 10 ? '0' : '') + seconds +
                         "</td><td></td></tr>");
                     }
 
+					$('#salamisandwich > tbody > tr').addClass('queue-track');
+
                     if(obj.data[obj.data.length-1].pos + 1 >= pagination + MAX_ELEMENTS_PER_PAGE)
                         $('#next').removeClass('hide');
                     if(pagination > 0)
                         $('#prev').removeClass('hide');
                     if ( isTouch ) {
                         $('#salamisandwich > tbody > tr > td:last-child').append(
-                                    "<a class=\"pull-right btn-group-hover\" href=\"#/\" " +
+                                    "<a class=\"pull-right btn-group-hover\" href=\"#/0\" " +
                                         "onclick=\"socket.send('MPD_API_RM_TRACK,' + $(this).parents('tr').attr('trackid')); $(this).parents('tr').remove();\">" +
                                 "<span class=\"glyphicon glyphicon-trash\"></span></a>");
                     } else {
@@ -238,7 +247,7 @@ function webSocketConnect() {
                             mouseover: function(){
                                 if($(this).children().last().has("a").length == 0)
                                     $(this).children().last().append(
-                                        "<a class=\"pull-right btn-group-hover\" href=\"#/\" " +
+                                        "<a class=\"pull-right btn-group-hover\" href=\"#/0\" " +
                                             "onclick=\"socket.send('MPD_API_RM_TRACK," + $(this).attr("trackid") +"'); $(this).parents('tr').remove();\">" +
                                     "<span class=\"glyphicon glyphicon-trash\"></span></a>")
                                 .find('a').fadeTo('fast',1);
@@ -288,11 +297,15 @@ function webSocketConnect() {
                             case "song":
                                 var minutes = Math.floor(obj.data[item].duration / 60);
                                 var seconds = obj.data[item].duration - minutes * 60;
+								var name = obj.data[item].title;
+								if(current_app == 'search') {
+									name += ' / ' + obj.data[item].album + ' / ' + obj.data[item].artist;
+								}
 
                                 $('#salamisandwich > tbody').append(
                                     "<tr uri=\"" + encodeURI(obj.data[item].uri) + "\" class=\"song\">" +
                                     "<td><span class=\"glyphicon glyphicon-music\"></span></td>" +
-                                    "<td>" + obj.data[item].title +"</td>" +
+                                    "<td>" + name +"</td>" +
                                     "<td>"+ minutes + ":" + (seconds < 10 ? '0' : '') + seconds +
                                     "</td><td></td></tr>"
                                 );
@@ -322,23 +335,33 @@ function webSocketConnect() {
                             .find('a').click(function(e) {
                                 e.stopPropagation();
                                 socket.send(onClickAction + "," + decodeURI($(this).parents("tr").attr("uri")));
-                            $('.top-right').notify({
-                                message:{
-                                    text: $('td:nth-child(2)', $(this).parents("tr")).text() + " added"
-                                } }).show();
+								var msg;
+								if($(this).parents("tr").attr("class") == 'plist') {
+									msg = ' deleted';
+									$(this).parents("tr").remove();
+								} else {
+									msg = ' added';
+								}
+								$('.top-right').notify({
+									message:{
+										text: $('td:nth-child(2)', $(this).parents("tr")).text() + msg
+									} }).show();
                             }).fadeTo('fast',1);
                     }
 
                     if ( isTouch ) {
                         appendClickableIcon($("#salamisandwich > tbody > tr.dir > td:last-child"), 'MPD_API_ADD_TRACK', 'plus');
-                        appendClickableIcon($("#salamisandwich > tbody > tr.song > td:last-child"), 'MPD_API_ADD_TRACK', 'play');
+                        appendClickableIcon($("#salamisandwich > tbody > tr.song > td:last-child"), 'MPD_API_INSERT_TRACK', 'play');
+                        appendClickableIcon($("#salamisandwich > tbody > tr.plist > td:last-child"), 'MPD_API_RM_PLAYLIST', 'trash');
                     } else {
                         $('#salamisandwich > tbody > tr').on({
                             mouseenter: function() {
                                 if($(this).is(".dir")) 
                                     appendClickableIcon($(this).children().last(), 'MPD_API_ADD_TRACK', 'plus');
                                 else if($(this).is(".song"))
-                                    appendClickableIcon($(this).children().last(), 'MPD_API_ADD_PLAY_TRACK', 'play');
+                                    appendClickableIcon($(this).children().last(), 'MPD_API_INSERT_TRACK', 'play')
+								else if($(this).is(".plist"))
+									appendClickableIcon($(this).children().last(), 'MPD_API_RM_PLAYLIST', 'trash');
                             },
                             mouseleave: function(){
                                 $(this).children().last().find("a").stop().remove();
@@ -349,10 +372,8 @@ function webSocketConnect() {
                         click: function() {
                             switch($(this).attr('class')) {
                                 case 'dir':
-                                    pagination = 0;
                                     browsepath = $(this).attr("uri");
-                                    $("#browse > a").attr("href", '#/browse/'+pagination+'/'+browsepath);
-                                    app.setLocation('#/browse/'+pagination+'/'+browsepath);
+                                    app.setLocation('#/browse/0/'+browsepath);
                                     break;
                                 case 'song':
                                     socket.send("MPD_API_ADD_TRACK," + decodeURI($(this).attr("uri")));
@@ -462,7 +483,6 @@ function webSocketConnect() {
                         socket.send('MPD_API_GET_QUEUE,'+pagination);
                     break;
                 case "song_change":
-
                     $('#album').text("");
                     $('#artist').text("");
 
@@ -477,6 +497,12 @@ function webSocketConnect() {
                         $('#artist').text(obj.data.artist);
                         notification += obj.data.artist + "<br />";
                     }
+                    if(obj.data.artwork) {
+						var artworkUrl = encodeURI(obj.data.artwork);
+						$('#artwork').attr('src', artworkUrl).on('error', function() {
+							$(this).attr('src', '/img/cover.jpg');
+						});
+                    }
 
                     if ($.cookie("notification") === "true")
                         songNotify(obj.data.title, obj.data.artist, obj.data.album );
@@ -493,6 +519,22 @@ function webSocketConnect() {
                     if(obj.data.passwort_set)
                         $('#mpd_password_set').removeClass('hide');
                     break;
+				case "mpdstats":
+					$('#stat_artists').text(obj.data.artists);
+					$('#stat_albums').text(obj.data.albums);
+					$('#stat_songs').text(obj.data.songs);
+					var update = new Date(obj.data.update * 1000);
+					$('#stat_update').text(update.toString());
+					var ttime = obj.data.ttime;
+					var days = Math.floor(ttime / 86400);
+					ttime -= days * 86400;
+					var hours = Math.floor(ttime / 3600) % 24;
+					ttime -= hours * 3600;
+					var mins = Math.floor(ttime / 60) % 60;
+					ttime -= mins * 60;
+					var secs = ttime % 60;
+					$('#stat_ttime').text(days + ' days ' + hours + ' hours ' + mins + ' mins ' + secs + ' secs');
+					break;
                 case "error":
                     $('.top-right').notify({
                         message:{text: obj.data},
@@ -571,15 +613,25 @@ var updatePlayIcon = function(state)
     if(state == 1) { // stop
         $("#play-icon").addClass("glyphicon-play");
         $('#track-icon').addClass("glyphicon-stop");
-    } else if(state == 2) { // pause
+		$('#progressbar').slider(0);
+    } else if(state == 2) { // playing
         $("#play-icon").addClass("glyphicon-pause");
         $('#track-icon').addClass("glyphicon-play");
-    } else { // play
+    } else { // paused
         $("#play-icon").addClass("glyphicon-play");
         $('#track-icon').addClass("glyphicon-pause");
     }
 }
 
+function clearPlaylist() {
+	socket.send('MPD_API_RM_ALL');
+	$('#currenttrack').text('');
+	$('#artist').text('');
+	$('#album').text('');
+	$('#counter').text('');
+	$('#artwork').attr('src', '/img/cover.jpg');
+}
+
 function updateDB() {
     socket.send('MPD_API_UPDATE_DB');
     $('.top-right').notify({
@@ -661,20 +713,27 @@ $('#search').submit(function () {
     return false;
 });
 
+$('.quicknav-btn').on('click', function(e) {
+	if (current_app == 'browse') {
+		var text = $(this).text();
+		if(text == 'Playlists') {
+			text = 'LST';
+		}
+		app.setLocation('#/browse/0/%5B'+text+'%5D');
+	}
+	e.preventDefault();
+});
+
 $('.page-btn').on('click', function (e) {
 
     switch ($(this).text()) {
         case "Next":
-            if (current_app == "dirble") dirble_page++;
-            else pagination += MAX_ELEMENTS_PER_PAGE;
+            pagination += MAX_ELEMENTS_PER_PAGE;
             break;
         case "Previous":
-            if (current_app == "dirble") dirble_page--
-            else {
-                pagination -= MAX_ELEMENTS_PER_PAGE;
-                if(pagination <= 0)
-                    pagination = 0;
-            }
+			pagination -= MAX_ELEMENTS_PER_PAGE;
+			if(pagination <= 0)
+				pagination = 0;
             break;
     }
 
@@ -685,9 +744,6 @@ $('.page-btn').on('click', function (e) {
         case "browse":
             app.setLocation('#/browse/'+pagination+'/'+browsepath);
             break;
-        case "dirble":
-            app.setLocation("#/dirble/"+dirble_catid+"/"+dirble_page);
-            break;
     }
     e.preventDefault();
 });
@@ -780,157 +836,3 @@ $(document).keydown(function(e){
     e.preventDefault();
 });
 
-function dirble_load_categories() {
-
-    dirble_page = 1;
-
-    $.getJSON( "http://api.dirble.com/v2/categories?token=2e223c9909593b94fc6577361a", function( data ) {
-
-        $('#dirble_loading').addClass('hide');
-
-        data = data.sort(function(a, b) {
-            return (a.title > b.title) ? 1 : 0;
-        });
-
-        var max = data.length - data.length%2;
-
-        for(i = 0; i < max; i+=2) {
-
-            $('#dirble_left > tbody').append(
-                "<tr><td catid=\""+data[i].id+"\">"+data[i].title+"</td></tr>"
-            );
-
-            $('#dirble_right > tbody').append(
-                "<tr><td catid=\""+data[i+1].id+"\">"+data[i+1].title+"</td></tr>"
-            );
-        }
-
-        if (max != data.length) {
-            $('#dirble_left > tbody').append(
-                "<tr><td catid=\""+data[max].id+"\">"+data[max].title+"</td></tr>"
-            );
-        }
-
-        $('#dirble_left > tbody > tr > td').on({
-            click: function() {
-                dirble_selected_cat = $(this).text();
-                dirble_catid = $(this).attr("catid");
-                app.setLocation("#/dirble/"+dirble_catid+"/"+dirble_page);
-            }
-        });
-
-        $('#dirble_right > tbody > tr > td').on({
-            click: function() {
-                dirble_selected_cat = $(this).text();
-                dirble_catid = $(this).attr("catid");
-                app.setLocation("#/dirble/"+dirble_catid+"/"+dirble_page);
-            }
-        });
-    });
-}
-
-
-function dirble_load_stations() {
-
-    $.getJSON( "http://api.dirble.com/v2/category/"+dirble_catid+"/stations?page="+dirble_page+"&per_page=20&token=2e223c9909593b94fc6577361a", function( data ) {
-
-        $('#dirble_loading').addClass('hide');
-        if (data.length == 20) $('#next').removeClass('hide');
-
-        var max = data.length - data.length%2;
-
-        for(i = 0; i < max; i+=2) {
-
-            $('#dirble_left > tbody').append(
-                "<tr><td radioid=\""+data[i].id+"\">"+data[i].name+"</td></tr>"
-            );
-            $('#dirble_right > tbody').append(
-                "<tr><td radioid=\""+data[i+1].id+"\">"+data[i+1].name+"</td></tr>"
-            );
-        }
-
-        if (max != data.length) {
-            $('#dirble_left > tbody').append(
-                "<tr><td radioid=\""+data[max].id+"\">"+data[max].name+"</td></tr>"
-            );
-        }
-
-        $('#dirble_left > tbody > tr > td').on({
-            click: function() {
-                var _this = $(this);
-
-                $.getJSON( "http://api.dirble.com/v2/station/"+$(this).attr("radioid")+"?token=2e223c9909593b94fc6577361a", function( data ) {
-
-                    socket.send("MPD_API_ADD_TRACK," + data.streams[0].stream);
-                    $('.top-right').notify({
-                        message:{
-                            text: _this.text() + " added"
-                        }
-                    }).show();
-                });
-            },
-            mouseenter: function() {
-                var _this = $(this);
-
-                $(this).last().append(
-                "<a role=\"button\" class=\"pull-right btn-group-hover\">" +
-                "<span class=\"glyphicon glyphicon-play\"></span></a>").find('a').click(function(e) {
-                    e.stopPropagation();
-
-                    $.getJSON( "http://api.dirble.com/v2/station/"+_this.attr("radioid")+"?token=2e223c9909593b94fc6577361a", function( data ) {
-
-                        socket.send("MPD_API_ADD_PLAY_TRACK," + data.streams[0].stream);
-                        $('.top-right').notify({
-                            message:{
-                                text: _this.text() + " added"
-                            }
-                        }).show();
-                    });
-                }).fadeTo('fast',1);
-            },
-
-            mouseleave: function(){
-                $(this).last().find("a").stop().remove();
-            }
-        });
-
-        $('#dirble_right> tbody > tr > td').on({
-            click: function() {
-                var _this = $(this);
-
-                $.getJSON( "http://api.dirble.com/v2/station/"+$(this).attr("radioid")+"?token=2e223c9909593b94fc6577361a", function( data ) {
-
-                    socket.send("MPD_API_ADD_TRACK," + data.streams[0].stream);
-                    $('.top-right').notify({
-                        message:{
-                            text: _this.text() + " added"
-                        }
-                    }).show();
-                });
-            },
-            mouseenter: function() {
-                var _this = $(this);
-
-                $(this).last().append(
-                "<a role=\"button\" class=\"pull-right btn-group-hover\">" +
-                "<span class=\"glyphicon glyphicon-play\"></span></a>").find('a').click(function(e) {
-                    e.stopPropagation();
-
-                    $.getJSON( "http://api.dirble.com/v2/station/"+_this.attr("radioid")+"?token=2e223c9909593b94fc6577361a", function( data ) {
-
-                        socket.send("MPD_API_ADD_PLAY_TRACK," + data.streams[0].stream);
-                        $('.top-right').notify({
-                            message:{
-                                text: _this.text() + " added"
-                            }
-                        }).show();
-                    });
-                }).fadeTo('fast',1);
-            },
-
-            mouseleave: function(){
-                $(this).last().find("a").stop().remove();
-            }
-        });
-    });
-}
diff --git a/src/mpd_client.c b/src/mpd_client.c
index 72719845b..4652c1c7a 100644
--- a/src/mpd_client.c
+++ b/src/mpd_client.c
@@ -27,6 +27,8 @@
 #include "config.h"
 #include "json_encode.h"
 
+extern const char *template;
+
 /* forward declaration */
 static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev);
 
@@ -42,6 +44,69 @@ char * get_arg2 (char *p) {
 	return get_arg1(get_arg1(p));
 }
 
+char *parse_templ(const char *templ, struct t_meta data) {
+    static char buffer[1024];
+    char *bptr = buffer;
+    const char *dptr;
+
+	int is_path = 0;
+    while(*templ != 0) {
+        dptr = 0;
+        if(*templ == '%') {
+            switch(*(templ + 1)) {
+                case 'A':
+                    dptr = data.artist;
+                    break;
+                case 'a':
+                    dptr = data.album;
+                    break;
+                case 't':
+                    dptr = data.track;
+                    break;
+                case 'T':
+                    dptr = data.title;
+                    break;
+				case 'P':
+					dptr = data.uri;
+					is_path = 1;
+					break;
+                case '%':
+                    *bptr++ = *templ;
+                    templ += 2;
+                    break;
+                default:
+                    printf("Unrecognised token %c\n", *(templ + 1));
+            }
+            if(dptr != 0) {
+				if(is_path) {
+					char *pptr = strdup(dptr);
+					char *dir = dirname(pptr);
+					while(*dir != 0) {
+						*bptr++ = *dir++;
+					}
+					free(pptr);
+				} else {
+					while(*dptr != 0) {
+						if(*dptr == '/' || *dptr == '?') {
+							*bptr = '_';
+						} else {
+							*bptr = *dptr;
+						}
+						bptr++;
+						dptr++;
+					}
+				}
+			}
+			templ += 2;
+        } else {
+            *bptr++ = *templ++;
+        }
+    }
+	*bptr = 0;
+
+    return buffer;
+}
+
 static inline enum mpd_cmd_ids get_cmd_id(char *cmd)
 {
     for(int i = 0; i < sizeof(mpd_cmd_strs)/sizeof(mpd_cmd_strs[0]); i++)
@@ -171,22 +236,28 @@ int callback_mpd(struct mg_connection *c)
 out_add_track:
             free(p_charbuf);
             break;
-        case MPD_API_ADD_PLAY_TRACK:
+        case MPD_API_INSERT_TRACK:
             p_charbuf = strdup(c->content);
-            if(strcmp(strtok(p_charbuf, ","), "MPD_API_ADD_PLAY_TRACK"))
-                goto out_play_track;
+            if(strcmp(strtok(p_charbuf, ","), "MPD_API_INSERT_TRACK"))
+                goto out_insert_track;
 
             if((token = strtok(NULL, ",")) == NULL)
-                goto out_play_track;
+                goto out_insert_track;
 
 			free(p_charbuf);
             p_charbuf = strdup(c->content);
-            int_buf = mpd_run_add_id(mpd.conn, get_arg1(p_charbuf));
-            if(int_buf != -1)
-                mpd_run_play_id(mpd.conn, int_buf);
-out_play_track:
+			struct mpd_status *status = mpd_run_status(mpd.conn);
+			int playing_pos = mpd_status_get_song_pos(status) + 1;
+			mpd_status_free(status);
+			mpd_run_add_id_to(mpd.conn, get_arg1(p_charbuf), playing_pos);
+out_insert_track:
             free(p_charbuf);
             break;
+		case MPD_API_MOVE_TRACK:
+            if(sscanf(c->content, "MPD_API_MOVE_TRACK,%u,%u", &uint_buf, &uint_buf_2)) {
+                mpd_run_move(mpd.conn, uint_buf, uint_buf_2);
+			}
+			break;
         case MPD_API_ADD_PLAYLIST:
             p_charbuf = strdup(c->content);
             if(strcmp(strtok(p_charbuf, ","), "MPD_API_ADD_PLAYLIST"))
@@ -201,6 +272,20 @@ int callback_mpd(struct mg_connection *c)
 out_playlist:
             free(p_charbuf);
             break;
+		case MPD_API_RM_PLAYLIST:
+			p_charbuf = strdup(c->content);
+			if(strcmp(strtok(p_charbuf, ","), "MPD_API_RM_PLAYLIST"))
+				goto out_rm_playlist;
+
+			if((token = strtok(NULL, ",")) == NULL)
+				goto out_rm_playlist;
+
+			free(p_charbuf);
+			p_charbuf = strdup(c->content);
+			mpd_run_rm(mpd.conn, get_arg1(p_charbuf));
+out_rm_playlist:
+			free(p_charbuf);
+			break;
         case MPD_API_SAVE_QUEUE:
             p_charbuf = strdup(c->content);
             if(strcmp(strtok(p_charbuf, ","), "MPD_API_SAVE_QUEUE"))
@@ -275,6 +360,23 @@ int callback_mpd(struct mg_connection *c)
             free(p_charbuf);
             break;
 #endif
+		case MPD_API_GET_STATS:
+			{
+				struct mpd_stats *stats = mpd_run_stats(mpd.conn);
+				unsigned int artists = mpd_stats_get_number_of_artists(stats);
+				unsigned int albums = mpd_stats_get_number_of_albums(stats);
+				unsigned int songs = mpd_stats_get_number_of_songs(stats);
+				unsigned long db_update = mpd_stats_get_db_update_time(stats);
+				unsigned long total_time = mpd_stats_get_db_play_time(stats);
+				n = snprintf(mpd.buf, MAX_SIZE, "{\"type\":\"mpdstats\", \"data\":"
+					"{\"artists\": %u, \"albums\": %u, \"songs\": %u, "
+					"\"update\": %lu, \"ttime\": %lu}}", artists, albums, songs, db_update, total_time);
+				mpd_stats_free(stats);
+			}
+			break;
+		default:
+			printf("Unknown token %d\n", cmd_id);
+			break;
     }
 
     if(mpd.conn_state == MPD_CONNECTED && mpd_connection_get_error(mpd.conn) != MPD_ERROR_SUCCESS)
@@ -511,26 +613,38 @@ int mpd_put_current_song(char *buffer)
     char *cur = buffer;
     const char *end = buffer + MAX_SIZE;
     struct mpd_song *song;
+    struct t_meta data;
 
     song = mpd_run_current_song(mpd.conn);
     if(song == NULL)
         return 0;
 
+    data.title = mpd_get_title(song);
+    data.artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
+    data.album = mpd_song_get_tag(song, MPD_TAG_ALBUM, 0);
+    data.track = mpd_song_get_tag(song, MPD_TAG_TRACK, 0);
+	data.uri = mpd_song_get_uri(song);
+
     cur += json_emit_raw_str(cur, end - cur, "{\"type\": \"song_change\", \"data\":{\"pos\":");
     cur += json_emit_int(cur, end - cur, mpd_song_get_pos(song));
     cur += json_emit_raw_str(cur, end - cur, ",\"title\":");
-    cur += json_emit_quoted_str(cur, end - cur, mpd_get_title(song));
+    cur += json_emit_quoted_str(cur, end - cur, data.title);
 
-    if(mpd_song_get_tag(song, MPD_TAG_ARTIST, 0) != NULL)
+    if(data.artist != NULL)
     {
         cur += json_emit_raw_str(cur, end - cur, ",\"artist\":");
-        cur += json_emit_quoted_str(cur, end - cur, mpd_song_get_tag(song, MPD_TAG_ARTIST, 0));
+        cur += json_emit_quoted_str(cur, end - cur, data.artist);
     }
 
-    if(mpd_song_get_tag(song, MPD_TAG_ALBUM, 0) != NULL)
+    if(data.album != NULL)
     {
         cur += json_emit_raw_str(cur, end - cur, ",\"album\":");
-        cur += json_emit_quoted_str(cur, end - cur, mpd_song_get_tag(song, MPD_TAG_ALBUM, 0));
+        cur += json_emit_quoted_str(cur, end - cur, data.album);
+    }
+
+    if(template != 0) {
+        cur += json_emit_raw_str(cur, end - cur, ",\"artwork\":");
+        cur += json_emit_quoted_str(cur, end - cur, parse_templ(template, data));
     }
 
     cur += json_emit_raw_str(cur, end - cur, "}}");
@@ -565,6 +679,8 @@ int mpd_put_queue(char *buffer, unsigned int offset)
             cur += json_emit_int(cur, end - cur, mpd_song_get_duration(song));
             cur += json_emit_raw_str(cur, end - cur, ",\"title\":");
             cur += json_emit_quoted_str(cur, end - cur, mpd_get_title(song));
+			cur += json_emit_raw_str(cur, end - cur, ",\"artist\":");
+			cur += json_emit_quoted_str(cur, end - cur, mpd_song_get_tag(song, MPD_TAG_ARTIST, 0));
             cur += json_emit_raw_str(cur, end - cur, "},");
         }
         mpd_entity_free(entity);
@@ -584,6 +700,20 @@ int mpd_put_browse(char *buffer, char *path, unsigned int offset)
     struct mpd_entity *entity;
     unsigned int entity_count = 0;
 
+	char quickStart = 0;
+	char quickEnd;
+	char quickList = 0;
+	// Looking for [A-C]
+	// special case [LST] for playlists only
+	if(strlen(path) == 5 && *path == '[' && path[strlen(path) - 1] == ']') {
+		quickStart = path[1];
+		quickEnd = path[3];
+		if(!strcmp("[LST]", path)) {
+			quickList = 1;
+		}
+		strcpy(path, "/");
+	}
+
     if (!mpd_send_list_meta(mpd.conn, path))
         RETURN_ERROR_AND_RECOVER("mpd_send_list_meta");
 
@@ -594,20 +724,49 @@ int mpd_put_browse(char *buffer, char *path, unsigned int offset)
         const struct mpd_directory *dir;
         const struct mpd_playlist *pl;
 
-        if(offset > entity_count)
-        {
-            mpd_entity_free(entity);
-            entity_count++;
-            continue;
-        }
-        else if(offset + MAX_ELEMENTS_PER_PAGE - 1 < entity_count)
-        {
-            mpd_entity_free(entity);
-            cur += json_emit_raw_str(cur, end  - cur, "{\"type\":\"wrap\",\"count\":");
-            cur += json_emit_int(cur, end - cur, entity_count);
-            cur += json_emit_raw_str(cur, end  - cur, "} ");
-            break;
-        }
+		if(quickList) {
+			if(mpd_entity_get_type(entity) != MPD_ENTITY_TYPE_PLAYLIST) {
+				mpd_entity_free(entity);
+				continue;
+			}
+		}
+		else if(quickStart) {
+			const char *name;
+
+			switch (mpd_entity_get_type(entity)) {
+				case MPD_ENTITY_TYPE_SONG:
+					name = mpd_get_title(mpd_entity_get_song(entity));
+					break;
+				case MPD_ENTITY_TYPE_DIRECTORY:
+					name = mpd_directory_get_path(mpd_entity_get_directory(entity));
+					break;
+				case MPD_ENTITY_TYPE_PLAYLIST:
+					name = mpd_playlist_get_path(mpd_entity_get_playlist(entity));
+					break;
+				default:
+					mpd_entity_free(entity);
+					continue;
+			}
+			if(*name < quickStart || *name > quickEnd) {
+				mpd_entity_free(entity);
+				continue;
+			}
+		}
+
+		if(offset > entity_count)
+		{
+			mpd_entity_free(entity);
+			entity_count++;
+			continue;
+		}
+		else if(offset + MAX_ELEMENTS_PER_PAGE - 1 < entity_count)
+		{
+			mpd_entity_free(entity);
+			cur += json_emit_raw_str(cur, end  - cur, "{\"type\":\"wrap\",\"count\":");
+			cur += json_emit_int(cur, end - cur, entity_count);
+			cur += json_emit_raw_str(cur, end  - cur, "} ");
+			break;
+		}
 
         switch (mpd_entity_get_type(entity)) {
             case MPD_ENTITY_TYPE_UNKNOWN:
@@ -679,6 +838,10 @@ int mpd_search(char *buffer, char *searchstr)
             cur += json_emit_int(cur, end - cur, mpd_song_get_duration(song));
             cur += json_emit_raw_str(cur, end - cur, ",\"title\":");
             cur += json_emit_quoted_str(cur, end - cur, mpd_get_title(song));
+			cur += json_emit_raw_str(cur, end - cur, ",\"artist\":");
+			cur += json_emit_quoted_str(cur, end - cur, mpd_song_get_tag(song, MPD_TAG_ARTIST, 0));
+			cur += json_emit_raw_str(cur, end - cur, ",\"album\":");
+			cur += json_emit_quoted_str(cur, end - cur, mpd_song_get_tag(song, MPD_TAG_ALBUM, 0));
             cur += json_emit_raw_str(cur, end - cur, "},");
             mpd_song_free(song);
 
diff --git a/src/mpd_client.h b/src/mpd_client.h
index dd78af933..90967b3f1 100644
--- a/src/mpd_client.h
+++ b/src/mpd_client.h
@@ -32,17 +32,20 @@
 
 
 #define MAX_SIZE 1024 * 100
-#define MAX_ELEMENTS_PER_PAGE 512
+#define MAX_ELEMENTS_PER_PAGE 50
 
 #define GEN_ENUM(X) X,
 #define GEN_STR(X) #X,
 #define MPD_CMDS(X) \
+	X(MPD_API_GET_STATS) \
     X(MPD_API_GET_QUEUE) \
     X(MPD_API_GET_BROWSE) \
     X(MPD_API_GET_MPDHOST) \
     X(MPD_API_ADD_TRACK) \
-    X(MPD_API_ADD_PLAY_TRACK) \
+	X(MPD_API_MOVE_TRACK) \
+    X(MPD_API_INSERT_TRACK) \
     X(MPD_API_ADD_PLAYLIST) \
+	X(MPD_API_RM_PLAYLIST) \
     X(MPD_API_PLAY_TRACK) \
     X(MPD_API_SAVE_QUEUE) \
     X(MPD_API_RM_TRACK) \
@@ -99,6 +102,14 @@ struct t_mpd_client_session {
     unsigned queue_version;
 };
 
+struct t_meta {
+    const char *artist;
+    const char *album;
+    const char *track;
+    const char *title;
+	const char *uri;
+};
+
 void mpd_poll(struct mg_server *s);
 int callback_mpd(struct mg_connection *c);
 int mpd_close_handler(struct mg_connection *c);
diff --git a/src/ympd.c b/src/ympd.c
index afa25c661..6c929c3b1 100644
--- a/src/ympd.c
+++ b/src/ympd.c
@@ -29,6 +29,8 @@
 #include "mpd_client.h"
 #include "config.h"
 
+const char *template = 0;
+
 extern char *optarg;
 
 int force_exit = 0;
@@ -85,12 +87,13 @@ int main(int argc, char **argv)
         {"port",         required_argument, 0, 'p'},
         {"webport",      required_argument, 0, 'w'},
         {"user",         required_argument, 0, 'u'},
+        {"artwork",      required_argument, 0, 'a'},
         {"version",      no_argument,       0, 'v'},
         {"help",         no_argument,       0,  0 },
         {0,              0,                 0,  0 }
     };
 
-    while((n = getopt_long(argc, argv, "h:p:w:u:v",
+    while((n = getopt_long(argc, argv, "h:p:w:u:a:v",
                 long_options, &option_index)) != -1) {
         switch (n) {
             case 'h':
@@ -105,6 +108,9 @@ int main(int argc, char **argv)
             case 'u':
                 run_as_user = strdup(optarg);
                 break;
+            case 'a':
+                template = strdup(optarg);
+                break;
             case 'v':
                 fprintf(stdout, "ympd  %d.%d.%d\n"
                         "Copyright (C) 2014 Andrew Karpow <andy@ndyk.de>\n"
@@ -117,18 +123,13 @@ int main(int argc, char **argv)
                         " -h, --host <host>\t\tconnect to mpd at host [localhost]\n"
                         " -p, --port <port>\t\tconnect to mpd at port [6600]\n"
                         " -w, --webport [ip:]<port>\tlisten interface/port for webserver [8080]\n"
+                        " -a, --artwork [url template] for artwork fetch\n"
                         " -u, --user <username>\t\tdrop priviliges to user after socket bind\n"
                         " -V, --version\t\t\tget version\n"
                         " --help\t\t\t\tthis help\n"
                         , argv[0]);
                 return EXIT_FAILURE;
         }
-
-        if(error_msg)
-        {
-            fprintf(stderr, "Mongoose error: %s\n", error_msg);
-            return EXIT_FAILURE;
-        }
     }
 
     error_msg = mg_set_option(server, "listening_port", webport);
diff --git a/tools/mkdata.c b/tools/mkdata.c
index d22c8e7f9..6e0606f61 100644
--- a/tools/mkdata.c
+++ b/tools/mkdata.c
@@ -50,6 +50,8 @@ static const char* get_mime(char* filename)
         return "image/svg+xml";
     if(!strcmp(extension, ".html"))
         return "text/html";
+	if(!strcmp(extension, ".jpg"))
+		return "image/jpeg";
     return "text/plain";
 }