diff --git a/app/Library/Assets.php b/app/Library/Assets.php
index c993bf44..5c3c1404 100644
--- a/app/Library/Assets.php
+++ b/app/Library/Assets.php
@@ -32,10 +32,14 @@ class Assets
         }
 
         foreach ($scripts as $filename) {
-            $scriptTags .= "<script src='/build/scripts/{$filename}?" . filemtime(public_path("build/scripts/{$filename}")) . "'></script>";
+            if (Config::get('app.debug') && $filename !== 'templates.js') {
+                $scriptTags .= "<script src='http://localhost:61999/build/scripts/{$filename}'></script>";
+            } else {
+                $scriptTags .= "<script src='/build/scripts/{$filename}?" . filemtime(public_path("build/scripts/{$filename}")) . "'></script>";
+            }
         }
 
-        if (Config::get("app.debug")) {
+        if (Config::get('app.debug')) {
             $scriptTags .= '<script src="http://localhost:61999/webpack-dev-server.js"></script>';
         }
 
diff --git a/public/templates/tracks/index.html b/public/templates/tracks/index.html
index 7cc15655..21f61669 100644
--- a/public/templates/tracks/index.html
+++ b/public/templates/tracks/index.html
@@ -69,13 +69,14 @@
     <ul>
         <li ng-class="{disabled: !prevPage}"><a href="#" ng-click="gotoPage(prevPage);" pfm-eat-click>Prev</a></li>
         <li ng-repeat="page in pages track by page" ng-class="{active: page == currentPage}">
-            <a href="#" ng-click="gotoPage(page);" pfm-eat-click>{{::page}}</a>
+            <a href="#" ng-click="gotoPage(page);" pfm-eat-click>{{page}}</a>
         </li>
         <li ng-class="{disabled: !nextPage}"><a href="#" ng-click="gotoPage(nextPage);" pfm-eat-click>Next</a></li>
         <li class="pagination-jump">
             <a href="#" ng-click="showPageSelector();" ng-hide="pageSelectorShown" pfm-eat-click>Jump&hellip;</a>
-            <form ng-submit="jumpToPage()" ng-show="pageSelectorShown">
-                <input type="number" id="pagination-jump-destination" ng-model="inputPageNumber" ng-blur="hidePageSelector()">
+            <form ng-submit="jumpToPage(inputPageNumber)" ng-show="pageSelectorShown">
+                <input type="number" id="pagination-jump-destination" ng-model="inputPageNumber" ng-blur="hidePageSelector()" />
+                <input type="submit" />
             </form>
         </li>
     </ul>
diff --git a/resources/assets/scripts/app/controllers/tracks.coffee b/resources/assets/scripts/app/controllers/tracks.coffee
index 308a1697..05899dc1 100644
--- a/resources/assets/scripts/app/controllers/tracks.coffee
+++ b/resources/assets/scripts/app/controllers/tracks.coffee
@@ -71,9 +71,9 @@ module.exports = angular.module('ponyfm').controller "tracks", [
             $scope.pages.push($scope.totalPages) unless $scope.totalPages in $scope.pages
 
         $scope.pageSelectorShown = false
-        $scope.inputPageNumber = $scope.currentPage
 
         $scope.gotoPage = (page) ->
+            console.log(page)
             $state.transitionTo 'content.tracks.list', {filter: $state.params.filter, page: page}
 
         $scope.showPageSelector = () ->
@@ -84,8 +84,8 @@ module.exports = angular.module('ponyfm').controller "tracks", [
             $scope.pageSelectorShown = false
 
 
-        $scope.jumpToPage = () ->
-            $scope.gotoPage($scope.inputPageNumber)
+        $scope.jumpToPage = (inputPageNumber) ->
+            $scope.gotoPage(inputPageNumber)
 
         $scope.$on '$destroy', -> tracks.mainQuery = tracks.createQuery()
 ]
diff --git a/resources/assets/styles/components.less b/resources/assets/styles/components.less
index e9a36941..9a76c6d7 100644
--- a/resources/assets/styles/components.less
+++ b/resources/assets/styles/components.less
@@ -421,5 +421,12 @@ html {
       padding: 0 5px;
       text-align: center;
     }
+
+    // This submit button is hidden because the
+    // ng-submit directive it's part of doesn't work
+    // without a submit button present in the form.
+    input[type="submit"] {
+      display: none;
+    }
   }
 }
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
index 7c9b983b..54a6a69c 100644
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -5,7 +5,7 @@ var _ = require('underscore');
 var webpackBaseConfig = require('./webpack.base.config.js');
 var config = _.clone(webpackBaseConfig);
 
-config.devtool = 'source-map';
+config.devtool = 'eval-source-map';
 config.output.publicPath = 'http://localhost:61999/build/';