diff --git a/package.json b/package.json
index 0c09b7017..c6ea8a514 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "hls.js": "^0.12.4",
     "howler": "^2.1.2",
     "swiper": "^4.5.0",
-    "sortable": "^2.0.0",
+    "sortablejs": "^1.9.0",
     "libjass": "^0.11.0"
   },
   "scripts": {
diff --git a/src/bundle.js b/src/bundle.js
index 7f273569d..601baeba8 100644
--- a/src/bundle.js
+++ b/src/bundle.js
@@ -27,7 +27,7 @@ require("swiper/dist/css/swiper.min.css");
 _define("swiper", function() { return swiper; });
 
 // sortable
-var sortable = require("sortable");
+var sortable = require("sortablejs");
 _define("sortable", function() { return sortable; });
 
 // libjass
diff --git a/src/css/nowplaying.css b/src/components/remotecontrol/remotecontrol.css
similarity index 98%
rename from src/css/nowplaying.css
rename to src/components/remotecontrol/remotecontrol.css
index 9bedb33c8..5d375d01d 100644
--- a/src/css/nowplaying.css
+++ b/src/components/remotecontrol/remotecontrol.css
@@ -178,7 +178,7 @@
 .playlistIndexIndicatorImage {
     -webkit-background-size: initial initial !important;
     background-size: initial !important;
-    background-image: url(../img/equalizer.gif) !important
+    background-image: url(../../img/equalizer.gif) !important;
 }
 
 .hideVideoButtons .videoButton {
@@ -202,7 +202,6 @@
 }
 
 @media all and (max-width:34em) {
-
     .nowPlayingInfoButtons .btnNowPlayingFastForward,
     .nowPlayingInfoButtons .btnNowPlayingRewind,
     .nowPlayingInfoButtons .playlist .listItemMediaInfo {
diff --git a/src/components/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
similarity index 99%
rename from src/components/remotecontrol.js
rename to src/components/remotecontrol/remotecontrol.js
index 9d99c0aaa..dae9f702e 100644
--- a/src/components/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -1,4 +1,4 @@
-define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageLoader", "playbackManager", "nowPlayingHelper", "events", "connectionManager", "apphost", "globalize", "cardStyle", "emby-itemscontainer", "css!css/nowplaying.css", "emby-ratingbutton"], function (browser, datetime, backdrop, libraryBrowser, listView, imageLoader, playbackManager, nowPlayingHelper, events, connectionManager, appHost, globalize) {
+define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageLoader", "playbackManager", "nowPlayingHelper", "events", "connectionManager", "apphost", "globalize", "cardStyle", "emby-itemscontainer", "css!./remotecontrol.css", "emby-ratingbutton"], function (browser, datetime, backdrop, libraryBrowser, listView, imageLoader, playbackManager, nowPlayingHelper, events, connectionManager, appHost, globalize) {
     "use strict";
 
     function showAudioMenu(context, player, button, item) {
diff --git a/src/controllers/nowplayingpage.js b/src/controllers/nowplayingpage.js
index 77eb7c221..7f1b9b3f1 100644
--- a/src/controllers/nowplayingpage.js
+++ b/src/controllers/nowplayingpage.js
@@ -1,4 +1,4 @@
-define(["components/remotecontrol", "libraryMenu", "emby-button"], function(remotecontrolFactory, libraryMenu) {
+define(["components/remotecontrol/remotecontrol", "libraryMenu", "emby-button"], function(remotecontrolFactory, libraryMenu) {
     "use strict";
     return function(view, params) {
         var remoteControl = new remotecontrolFactory;