diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 7e8eef7d29..85b9b62441 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -843,15 +843,22 @@ progress {
     bottom: -5px;
 }
 
+@media all and (min-width: 650px) {
+
+    .itemVideo {
+        width: 270px;
+    }
+}
+
 .vjs-quality-button {
     padding: 0 0.6em !important;
     width: auto !important;
 }
 
-    .vjs-quality-button div {
-        width: auto !important;
-        background: none !important;
-    }
+.vjs-quality-button div {
+    width: auto !important;
+    background: none !important;
+}
 
 .vjs-chapter-button div {
     background-position: -100px -75px !important;
@@ -863,16 +870,21 @@ progress {
     overflow-y: scroll;
 }
 
-    .vjs-chapter-button.vjs-menu-button ul li {
-        width: auto;
-        white-space: nowrap;
-        font-size: 1.1em;
-        padding-right: 10px;
-    }
-
-@media all and (min-width: 650px) {
-
-    .itemVideo {
-        width: 270px;
-    }
+.vjs-chapter-button.vjs-menu-button ul li {
+    width: auto;
+    white-space: nowrap;
+    font-size: 1.1em;
+    padding-right: 10px;
 }
+
+.vjs-default-skin .vjs-menu-button.vjs-stop-button {
+    float: left;
+    background: none;
+    border: 0;
+}
+.vjs-default-skin .vjs-menu-button.vjs-stop-button div {
+    background: url("images/media/stop.png");
+    height: 26px;
+    width: 26px;
+    margin: -.7em .5em auto 0;
+}
\ No newline at end of file
diff --git a/dashboard-ui/scripts/extensions.js b/dashboard-ui/scripts/extensions.js
index 52c056f254..6d95dda5db 100644
--- a/dashboard-ui/scripts/extensions.js
+++ b/dashboard-ui/scripts/extensions.js
@@ -484,17 +484,17 @@ _V_.ResolutionMenuItem = _V_.MenuItem.extend({
 
         // Change the source and make sure we don't start the video over
         var currentSrc = this.player.tag.src;
-        var newSrc = currentSrc.replace(new RegExp("videoBitrate=[0-9]+","g"),"videoBitrate="+resolutions[this.options.src[0].res][0]);
-        newSrc = newSrc.replace(new RegExp("audioBitrate=[0-9]+","g"),"audioBitrate="+resolutions[this.options.src[0].res][1]);
-        newSrc = newSrc.replace(new RegExp("maxWidth=[0-9]+","g"),"maxWidth="+resolutions[this.options.src[0].res][2]);
-        newSrc = newSrc.replace(new RegExp("maxHeight=[0-9]+","g"),"maxHeight="+resolutions[this.options.src[0].res][3]);
+        var src = parse_src_url(currentSrc);
+        var newSrc = "/mediabrowser/"+src.Type+"/"+src.item_id+"/stream."+src.stream+"?audioChannels="+src.audioChannels+"&audioBitrate="+resolutions[this.options.src[0].res][1]+
+            "&videoBitrate="+resolutions[this.options.src[0].res][0]+"&maxWidth="+resolutions[this.options.src[0].res][2]+"&maxHeight="+resolutions[this.options.src[0].res][3]+
+            "&videoCodec="+src.videoCodec+"&audioCodec="+src.audioCodec;
 
         if (this.player.duration() == "Infinity")  {
             if (currentSrc.indexOf("StartTimeTicks") >= 0) {
-                var startTimeTicks = newSrc.match(new RegExp("StartTimeTicks=[0-9]+","g"));
+                var startTimeTicks = currentSrc.match(new RegExp("StartTimeTicks=[0-9]+","g"));
                 var start_time = startTimeTicks[0].replace("StartTimeTicks=","");
 
-                newSrc = newSrc.replace(new RegExp("StartTimeTicks=[0-9]+","g"),"StartTimeTicks="+Math.floor(parseInt(start_time)+(10000000*current_time)));
+                newSrc += "&StartTimeTicks="+Math.floor(parseInt(start_time)+(10000000*current_time));
             }else {
                 newSrc += "&StartTimeTicks="+Math.floor(10000000*current_time);
             }
@@ -683,6 +683,36 @@ _V_.ChapterMenuItem = _V_.MenuItem.extend({
     }
 });
 
+/*
+ JS for the stop button in video.js player
+ */
+
+/*
+ Define the base class for the stop button.
+ */
+
+_V_.StopButton = _V_.Button.extend({
+
+    kind: "stop",
+    className: "vjs-stop-button",
+
+    init: function(player, options) {
+
+        this._super(player, options);
+
+    },
+
+    buildCSSClass: function() {
+
+        return this.className + " vjs-menu-button " + this._super();
+    },
+
+    onClick: function() {
+        MediaPlayer.stop();
+    }
+});
+
+
 //convert Ticks to human hr:min:sec format
 function ticks_to_human(str) {
 
@@ -699,4 +729,28 @@ function ticks_to_human(str) {
     time += ":" + seconds.substr(-2);
 
     return time;
-};
\ No newline at end of file
+};
+
+//parse video player src URL
+function parse_src_url(url) {
+   var src = url.replace("\?","\&");
+    var parts = src.split("/");
+    var len = parts.length-1;
+    var query = parts[len].split("&");
+    var array = new Array();
+
+    array['Type'] = parts[len-2];
+    array['item_id'] = parts[len-1];
+
+    for (i = 0; i < query.length; i++) {
+        if (i == 0) {
+            var pairs = query[i].split(".");
+        }else {
+            var pairs = query[i].split("=");
+        }
+
+        array[pairs[0]] = pairs[1];
+    }
+
+    return array;
+}
\ No newline at end of file
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index ee545bc980..44ec08540c 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -316,6 +316,9 @@ var videoJSextension = {
      */
     setup_video : function( $video, item ) {
 
+        // Add the stop button.
+        _V_.merge( _V_.ControlBar.prototype.options.components, { StopButton : {} } );
+
         var vid_id = $video.attr( 'id' ),
             available_res = ['high','medium','low'],
             default_res,
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index e86d969b4c..8915e744df 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1156,7 +1156,7 @@ $(function () {
     var footerHtml = '<div id="footer" class="ui-bar-a">';
     footerHtml += '<div id="nowPlayingBar" style="display:none;">';
     footerHtml += '<button id="previousTrackButton" class="imageButton mediaButton" title="Previous Track" type="button"><img src="css/images/media/previoustrack.png" /></button>';
-    footerHtml += '<button id="stopButton" class="imageButton mediaButton" title="Stop" type="button" onclick="MediaPlayer.stop();"><img src="css/images/media/stop.png" /></button>';
+    //footerHtml += '<button id="stopButton" class="imageButton mediaButton" title="Stop" type="button" onclick="MediaPlayer.stop();"><img src="css/images/media/stop.png" /></button>';
     footerHtml += '<button id="nextTrackButton" class="imageButton mediaButton" title="Next Track" type="button"><img src="css/images/media/nexttrack.png" /></button>';
     footerHtml += '<div id="mediaElement"></div>';
     footerHtml += '<div id="mediaInfo"></div>';