diff --git a/dashboard-ui/css/remotecontrol.css b/dashboard-ui/css/remotecontrol.css
new file mode 100644
index 0000000000..524ff84329
--- /dev/null
+++ b/dashboard-ui/css/remotecontrol.css
@@ -0,0 +1,95 @@
+#remoteControlFlyout {
+    width: 300px;
+    min-height: 400px;
+}
+
+.playMenuOptions {
+    max-height: 200px;
+    overflow-y: auto;
+    border: 1px solid #aaa;
+}
+
+.tblRemoteControl {
+    width: 100%;
+    border-spacing: 0;
+    border-collapse: collapse;
+}
+
+    .tblRemoteControl tbody tr:hover {
+        background: #ddd;
+    }
+
+    .tblRemoteControl td {
+        padding: 2px 5px;
+        border-top: 1px solid #ccc;
+        text-align: left;
+    }
+
+    .tblRemoteControl th {
+        padding: 2px 5px;
+        text-align: left;
+    }
+
+        .tblRemoteControl th:first-child, .tblRemoteControl td:first-child {
+            padding-left: 0;
+            padding-right: 0;
+        }
+
+.tblRemoteControlNoHeader tr:first-child td {
+    border-top: 0;
+}
+
+.tdSelectPlayTime, .tdSelectItem {
+    vertical-align: middle!important;
+    width: 30px;
+}
+
+.tdRemoteControlImage {
+    width: 100px;
+}
+
+.tblRemoteControl img {
+    height: 50px;
+}
+
+@media all and (max-width: 400px) {
+    .nowPlayingCell {
+        display: none;
+    }
+}
+
+@media all and (min-height: 500px) {
+    #remoteControlFlyout {
+        min-height: 450px;
+    }
+}
+
+@media all and (min-height: 600px) {
+    #remoteControlFlyout {
+        min-height: 500px;
+    }
+}
+
+@media all and (min-height: 800px) {
+    .playMenuOptions {
+        max-height: 300px;
+    }
+}
+
+@media all and (min-width: 500px) {
+    #remoteControlFlyout {
+        width: 450px;
+    }
+}
+
+@media all and (min-width: 600px) {
+    #remoteControlFlyout {
+        width: 550px;
+    }
+}
+
+@media all and (min-width: 700px) {
+    #remoteControlFlyout {
+        width: 650px;
+    }
+}
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index 2c19c85239..6b7f4d4a59 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -866,7 +866,15 @@
 
         $('#btnRemote', page).on('click', function () {
 
-            RemoteControl.showMenu(page, currentItem);
+            RemoteControl.showMenu({
+                
+                item: currentItem,
+                context: getContext(currentItem),
+                
+                themeSongs: $('#themeSongsCollapsible:visible', page).length > 0,
+
+                themeVideos: $('#themeVideosCollapsible:visible', page).length > 0
+            });
         });
 
     }).on('pageshow', "#itemDetailPage", function () {
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 4869388769..4efb475087 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -470,7 +470,7 @@
 
         $('#btnRemote', page).on('click', function () {
 
-            RemoteControl.showMenu(page, currentItem, getParameterByName('context') || '');
+            RemoteControl.showMenu({ item: currentItem, context: getParameterByName('context') || '' });
         });
 
     }).on('pageshow', "#itemByNameDetailPage", function () {
diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js
index 7291818a02..c040f8d527 100644
--- a/dashboard-ui/scripts/remotecontrol.js
+++ b/dashboard-ui/scripts/remotecontrol.js
@@ -1,23 +1,42 @@
 (function (window, document, $) {
 
-    function showMenu(page, item, context, sessionsPromise, usersPromise) {
+    function showMenu(options, sessionsPromise, usersPromise) {
+
+        var playFromRendered;
+        var trailersRendered;
+        var specialFeaturesRendered;
+        var themeVideosRendered;
+        var themeSongsRendered;
+
+        var item = options.item;
 
         var html = '<div data-role="popup" id="remoteControlFlyout">';
 
         html += '<div class="ui-corner-top ui-bar-a" style="text-align:center;">';
-        html += '<h3>Remote Control</h3>';
+        html += '<div style="margin:.5em 0;">Remote Control</div>';
         html += '</div>';
 
         html += '<div data-role="content" class="ui-corner-bottom ui-content">';
 
-        html += '<form id="sendToForm"><div class="sessionsPopupContent">';
+        html += '<form id="sendToForm">';
+        html += '<input type="hidden" value="PlayNow" id="fldPlayCommand" />';
+        html += '<div class="sessionsPopupContent">';
 
         html += '<div class="circle"></div><div class="circle1"></div>';
 
         html += '</div>';
 
-        html += '<p style="text-align:center;margin:0;"><button type="submit" data-icon="ok" data-theme="b" data-mini="true" data-inline="true">Ok</button>';
-        html += '<button type="button" data-icon="delete" onclick="$(\'#remoteControlFlyout\').popup(\'close\');" data-theme="a" data-mini="true" data-inline="true">Cancel</button></p>';
+        html += '<p style="text-align:center;margin:.5em 0 0;">';
+
+        html += '<span id="playButtonContainer" onclick="$(\'#fldPlayCommand\').val(\'PlayNow\');" style="display:none;"><button type="submit" data-icon="play" data-theme="b" data-mini="true" data-inline="true">Play</button></span>';
+        
+        html += '<span id="queueButtonContainer" onclick="$(\'#fldPlayCommand\').val(\'PlayLast\');" style="display:none;"><button type="submit" data-icon="play" data-theme="b" data-mini="true" data-inline="true">Queue</button></span>';
+
+        html += '<span id="okButtonContainer"><button type="submit" data-icon="ok" data-theme="b" data-mini="true" data-inline="true">Ok</button></span>';
+
+        html += '<button type="button" data-icon="delete" onclick="$(\'#remoteControlFlyout\').popup(\'close\');" data-theme="a" data-mini="true" data-inline="true">Cancel</button>';
+
+        html += '</p>';
 
         html += '</form></div>';
 
@@ -25,11 +44,26 @@
 
         $(document.body).append(html);
 
-        var popup = $('#remoteControlFlyout').popup({ history: false }).trigger('create').popup("open").on("popupafterclose", function () {
+        var popup = $('#remoteControlFlyout').popup({ history: false, tolerance: 0, corners: false }).trigger('create').popup("open").on("popupafterclose", function () {
 
             $(this).off("popupafterclose").remove();
         });
 
+        popup.on('click', '.trSession', function () {
+
+            $('input', this).checked(true);
+
+
+        }).on('click', '.trSelectPlayTime', function () {
+
+            $('input', this).checked(true);
+
+        }).on('click', '.trItem', function () {
+
+            $('input', this).checked(true);
+
+        });
+
         $('#sendToForm', popup).on('submit', function () {
 
             var checkboxes = $('.chkClient', popup);
@@ -64,15 +98,45 @@
                     ItemId: item.Id,
                     ItemName: item.Name,
                     ItemType: item.Type,
-                    Context: context
+                    Context: options.context
 
                 });
             }
-            else if (command == "Play") {
+            else if (command == "Play" || command == "PlayFromChapter") {
+
+                var checkedChapter = $('.chkSelectPlayTime:checked', popup);
+
+                var ticks = checkedChapter.length ? checkedChapter.parents('.trSelectPlayTime').attr('data-ticks') : 0;
+
                 promise = ApiClient.sendPlayCommand(sessionIds[0], {
 
                     ItemIds: [item.Id].join(','),
-                    PlayCommand: 'PlayNow'
+                    PlayCommand: $('#fldPlayCommand', popup).val(),
+                    StartPositionTicks: ticks
+
+                });
+            }
+            else if (command == "Resume") {
+                promise = ApiClient.sendPlayCommand(sessionIds[0], {
+
+                    ItemIds: [item.Id].join(','),
+                    PlayCommand: 'PlayNow',
+                    StartPositionTicks: item.UserData.PlaybackPositionTicks
+
+                });
+            }
+            else if (command == "Trailer" || command == "SpecialFeature" || command == "ThemeSong" || command == "ThemeVideo") {
+
+                var id = $('.chkSelectItem:checked', popup).parents('.trItem').attr('data-id');
+
+                if (!id) {
+                    Dashboard.alert('Please select an item.');
+                    return false;
+                }
+                promise = ApiClient.sendPlayCommand(sessionIds[0], {
+
+                    ItemIds: [id].join(','),
+                    PlayCommand: $('#fldPlayCommand', popup).val()
 
                 });
             }
@@ -95,12 +159,179 @@
                 return s.DeviceId != deviceId;
             });
 
-            renderSessions(sessions, response2[0], item, elem);
+            renderSessions(sessions, response2[0], options, elem);
 
+            $('#selectCommand', popup).on('change', function () {
+
+                var playFromMenu = $('.playFromMenu', popup).hide();
+                var trailersElem = $('.trailers', popup).hide();
+                var specialFeaturesElem = $('.specialFeatures', popup).hide();
+                var themeSongsElem = $('.themeSongs', popup).hide();
+                var themeVideosElem = $('.themeVideos', popup).hide();
+                var playButtonContainer = $('#playButtonContainer', popup).hide();
+                var queueButtonContainer = $('#queueButtonContainer', popup).hide();
+                var okButtonContainer = $('#okButtonContainer', popup).hide();
+
+                var value = this.value;
+
+                if (value == "Browse") {
+
+                    okButtonContainer.show();
+                }
+                else if (value == "Play") {
+
+                    playButtonContainer.show();
+                    queueButtonContainer.show();
+                }
+                else if (value == "Resume") {
+
+                    playButtonContainer.show();
+                }
+                else if (value == "PlayFromChapter" && item.Chapters && item.Chapters.length) {
+
+                    playFromMenu.show();
+                    playButtonContainer.show();
+
+                    if (!playFromRendered) {
+                        playFromRendered = true;
+                        renderPlayFromOptions(playFromMenu, item);
+                    }
+
+                    $('#remoteControlFlyout').popup("reposition", { tolerance: 0 });
+                }
+                else if (value == "Trailer") {
+
+                    trailersElem.show();
+                    playButtonContainer.show();
+                    queueButtonContainer.show();
+
+                    if (!trailersRendered) {
+                        trailersRendered = true;
+
+                        ApiClient.getLocalTrailers(Dashboard.getCurrentUserId(), item.Id).done(function (trailers) {
+
+                            renderVideos(trailersElem, trailers, 'Trailers');
+
+                            $('#remoteControlFlyout').popup("reposition", { tolerance: 0 });
+                        });
+                    }
+                }
+                else if (value == "SpecialFeature") {
+
+                    specialFeaturesElem.show();
+                    playButtonContainer.show();
+                    queueButtonContainer.show();
+
+                    if (!specialFeaturesRendered) {
+                        specialFeaturesRendered = true;
+
+                        ApiClient.getSpecialFeatures(Dashboard.getCurrentUserId(), item.Id).done(function (videos) {
+
+                            renderVideos(specialFeaturesElem, videos, 'Special Features');
+
+                            $('#remoteControlFlyout').popup("reposition", { tolerance: 0 });
+                        });
+                    }
+                }
+                else if (value == "ThemeSong") {
+
+                    themeSongsElem.show();
+                    playButtonContainer.show();
+                    queueButtonContainer.show();
+
+                    if (!themeSongsRendered) {
+                        themeSongsRendered = true;
+
+                        ApiClient.getThemeSongs(Dashboard.getCurrentUserId(), item.Id).done(function (result) {
+
+                            renderVideos(themeSongsElem, result.Items, 'Theme Songs');
+
+                            $('#remoteControlFlyout').popup("reposition", { tolerance: 0 });
+                        });
+                    }
+                }
+                else if (value == "ThemeVideo") {
+
+                    themeVideosElem.show();
+                    playButtonContainer.show();
+                    queueButtonContainer.show();
+
+                    if (!themeVideosRendered) {
+                        themeVideosRendered = true;
+
+                        ApiClient.getThemeVideos(Dashboard.getCurrentUserId(), item.Id).done(function (result) {
+
+                            renderVideos(themeVideosElem, result.Items, 'Theme Videos');
+
+                            $('#remoteControlFlyout').popup("reposition", { tolerance: 0 });
+                        });
+                    }
+                }
+
+            });
         });
     }
 
-    function renderSessions(sessions, users, item, elem) {
+    function renderPlayFromOptions(elem, item) {
+
+        var html = '';
+
+        html += '<h4 style="margin: 1em 0 .5em;">Play from scene</h4>';
+
+        html += '<div class="playMenuOptions">';
+        html += '<table class="tblRemoteControl tblRemoteControlNoHeader">';
+
+        html += '<tbody>';
+
+        for (var i = 0, length = item.Chapters.length; i < length; i++) {
+
+            var chapter = item.Chapters[i];
+
+            html += '<tr class="trSelectPlayTime" data-ticks="' + chapter.StartPositionTicks + '">';
+
+            var name = chapter.Name || ("Chapter " + (i + 1));
+
+            html += '<td class="tdSelectPlayTime"></td>';
+
+            html += '<td class="tdRemoteControlImage">';
+
+            var imgUrl;
+
+            if (chapter.ImageTag) {
+
+                imgUrl = ApiClient.getImageUrl(item.Id, {
+                    maxheight: 80,
+                    tag: chapter.ImageTag,
+                    type: "Chapter",
+                    index: i
+                });
+
+            } else {
+                imgUrl = "css/images/media/chapterflyout.png";
+            }
+
+            html += '<img src="' + imgUrl + '" />';
+
+            html += '</td>';
+
+            html += '<td>' + name + '<br/>' + DashboardPage.getDisplayText(chapter.StartPositionTicks) + '</td>';
+
+            html += '</tr>';
+        }
+
+        html += '</tbody>';
+
+        html += '</table>';
+        html += '</div>';
+
+        elem.html(html);
+
+        $('.tdSelectPlayTime', elem).html('<input type="radio" class="chkSelectPlayTime" name="chkSelectPlayTime" />');
+
+        $('.chkSelectPlayTime:first', elem).checked(true);
+    }
+
+    function renderSessions(sessions, users, options, elem) {
 
         if (!sessions.length) {
             elem.html('<p>There are currently no available media browser sessions to control.</p>');
@@ -108,31 +339,63 @@
             return;
         }
 
+        var item = options.item;
+
         var html = '';
 
-        html += '<p style="margin-top:0;">';
-        html += '<label for="selectCommand">Select Command</label>';
+        html += '<div style="margin-top:0;">';
+        html += '<label for="selectCommand">Select command</label>';
         html += '<select id="selectCommand" data-mini="true">';
-        html += '<option value="Browse">Browse To</label>';
+        html += '<option value="Browse">Browse to</label>';
 
         if (item.Type != 'Person' && item.Type != 'Genre' && item.Type != 'Studio' && item.Type != 'Artist') {
+
             html += '<option value="Play">Play</label>';
+
+            if (!item.IsFolder && item.UserData && item.UserData.PlaybackPositionTicks) {
+                html += '<option value="Resume">Resume</label>';
+            }
+
+            if (item.Chapters && item.Chapters.length) {
+                html += '<option value="PlayFromChapter">Play from scene</label>';
+            }
+
+            if (item.LocalTrailerCount) {
+                html += '<option value="Trailer">Play trailer</label>';
+            }
+
+            if (item.SpecialFeatureCount) {
+                html += '<option value="SpecialFeature">Play special feature</label>';
+            }
+
+            if (options.themeSongs) {
+                html += '<option value="ThemeSong">Play theme song</label>';
+            }
+
+            if (options.themeVideos) {
+                html += '<option value="ThemeVideo">Play theme video</label>';
+            }
         }
 
         html += '</select>';
-        html += '</p>';
+        html += '</div>';
 
-        html += '<p style="margin: 1.5em 0;">Send To Device</p>';
+        html += '<div class="playFromMenu" style="display:none;"></div>';
+        html += '<div class="trailers" style="display:none;"></div>';
+        html += '<div class="specialFeatures" style="display:none;"></div>';
+        html += '<div class="themeSongs" style="display:none;"></div>';
+        html += '<div class="themeVideos" style="display:none;"></div>';
 
-        html += '<div>';
+        html += '<h4 style="margin: 1em 0 .5em;">Select Device</h4>';
 
-        html += '<table data-role="table" data-mode="reflow" class="ui-responsive table-stroke">';
+        html += '<table class="tblRemoteControl">';
 
         html += '<thead><tr>';
         html += '<th></th>';
         html += '<th>Client</th>';
         html += '<th>Device</th>';
         html += '<th>User</th>';
+        html += '<th class="nowPlayingCell">Now Playing</th>';
         html += '</tr></thead>';
 
         html += '<tbody>';
@@ -143,7 +406,7 @@
 
             html += '<tr class="trSession" data-sessionid="' + session.Id + '">';
 
-            html += '<td class="checkboxCell"></td>';
+            html += '<td class="tdSelectSession"></td>';
             html += '<td>' + session.Client + '</td>';
             html += '<td>' + session.DeviceName + '</td>';
 
@@ -163,6 +426,10 @@
 
             html += '</td>';
 
+            html += '<td class="nowPlayingCell">';
+            html += session.NowPlayingItem ? session.NowPlayingItem.Name : '';
+            html += '</td>';
+
             html += '</tr>';
         }
 
@@ -170,22 +437,83 @@
 
         html += '</table>';
 
-        html += '<br/>';
         html += '</div>';
 
         elem.html(html).trigger('create');
 
-        $('.checkboxCell', elem).html('<input type="radio" class="chkClient" name="chkClient" />');
+        $('.tdSelectSession', elem).html('<input type="radio" class="chkClient" name="chkClient" />');
 
-        $('#remoteControlFlyout').popup("reposition", {});
+        $('.chkClient:first', elem).checked(true);
+
+        $('#remoteControlFlyout').popup("reposition", { tolerance: 0 });
+    }
+
+    function renderVideos(elem, videos, header) {
+
+        var html = '';
+
+        html += '<h4 style="margin: 1em 0 .5em;">' + header + '</h4>';
+
+        html += '<div class="playMenuOptions">';
+        html += '<table class="tblRemoteControl tblRemoteControlNoHeader">';
+
+        html += '<tbody>';
+
+        for (var i = 0, length = videos.length; i < length; i++) {
+
+            var video = videos[i];
+
+            html += '<tr class="trItem" data-id="' + video.Id + '">';
+
+
+            html += '<td class="tdSelectItem"></td>';
+
+            html += '<td class="tdRemoteControlImage">';
+
+            var imgUrl;
+
+            if (video.ImageTags && video.ImageTags.Primary) {
+
+                imgUrl = ApiClient.getImageUrl(video.Id, {
+                    maxheight: 80,
+                    tag: video.ImageTags.Primary,
+                    type: "Primary"
+                });
+
+                html += '<img src="' + imgUrl + '" />';
+            }
+
+            html += '</td>';
+
+            html += '<td>' + video.Name;
+
+            if (video.RunTimeTicks) {
+                html += '<br/>' + DashboardPage.getDisplayText(video.RunTimeTicks);
+            }
+
+            html += '</td>';
+
+            html += '</tr>';
+        }
+
+        html += '</tbody>';
+
+        html += '</table>';
+        html += '</div>';
+
+        elem.html(html);
+
+        $('.tdSelectItem', elem).html('<input type="radio" class="chkSelectItem" name="chkSelectItem" />');
+
+        $('.chkSelectItem:first', elem).checked(true);
     }
 
     function remoteControl() {
 
         var self = this;
 
-        self.showMenu = function (page, item, context) {
-            showMenu(page, item, context, ApiClient.getSessions({ SupportsRemoteControl: true }), ApiClient.getUsers());
+        self.showMenu = function (options) {
+            showMenu(options, ApiClient.getSessions({ SupportsRemoteControl: true }), ApiClient.getUsers());
         };
     }