diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index e8135f718b..bf78665b7e 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -912,6 +912,22 @@ a.itemTag:hover {
         background-color: transparent !important;
     }
 
+.alternateVersionIndicator {
+    display: block;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    text-align: center;
+    vertical-align: middle;
+    width: 22px;
+    height: 19px;
+    padding-top: 3px;
+    border-radius: 50%;
+    color: #fff;
+    background: rgb(51, 136, 204);
+    background: rgba(51, 136, 204, .9);
+}
+
 .unidentifiedIndicator {
     display: block;
     position: absolute;
diff --git a/dashboard-ui/editcollectionitems.html b/dashboard-ui/editcollectionitems.html
index 7d7c1d1a09..a1989d4f48 100644
--- a/dashboard-ui/editcollectionitems.html
+++ b/dashboard-ui/editcollectionitems.html
@@ -59,7 +59,7 @@
                         </button>
                     </div>
 
-                    <div class="collectionItemSearchResults" style="min-height:100px;">
+                    <div class="collectionItemSearchResults">
                     </div>
 
                     <button id="btnAddItems" type="button" data-icon="plus" data-mini="true">
diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js
index 862fcbd35b..622b0c8bd4 100644
--- a/dashboard-ui/scripts/episodes.js
+++ b/dashboard-ui/scripts/episodes.js
@@ -44,7 +44,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js
index 6e75cefc6c..4a6cdddc97 100644
--- a/dashboard-ui/scripts/gamespage.js
+++ b/dashboard-ui/scripts/gamespage.js
@@ -42,7 +42,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 24903bd467..ba20a2787a 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -487,7 +487,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
 
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 4dd64c5fc4..77dea73c68 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -227,7 +227,7 @@
             renderAdditionalParts(page, item, user);
         }
 
-        if (!item.HasAlternateVersions) {
+        if (!item.AlternateVersionCount) {
             $('#alternateVersionsCollapsible', page).addClass('hide');
         } else {
             $('#alternateVersionsCollapsible', page).removeClass('hide');
@@ -483,7 +483,7 @@
                 borderless: item.Type == "Game"
             });
 
-            $('#similarContent', page).html(html).createPosterItemHoverMenu();
+            $('#similarContent', page).html(html).createPosterItemMenus();
         });
     }
 
@@ -615,7 +615,7 @@
                     });
                 }
 
-                $('#childrenContent', page).html(html).createPosterItemHoverMenu();
+                $('#childrenContent', page).html(html).createPosterItemMenus();
 
                 if (item.Type == "BoxSet") {
 
@@ -688,7 +688,7 @@
             renderCollectionItemType(page, { name: 'Titles' }, items, user);
         }
 
-        $('.collectionItems', page).trigger('create').createPosterItemHoverMenu();
+        $('.collectionItems', page).trigger('create').createPosterItemMenus();
     }
 
     function renderCollectionItemType(page, type, items, user) {
@@ -905,8 +905,6 @@
 
                 $('#alternateVersionsCollapsible', page).show();
 
-                $('#additionalPartsCollapsible', page).show();
-
                 var html = LibraryBrowser.getPosterViewHtml({
                     items: result.Items,
                     shape: "portrait",
@@ -917,7 +915,7 @@
                     formatIndicators: true
                 });
 
-                $('#alternateVersionsContent', page).html(html).trigger('create').createPosterItemHoverMenu();
+                $('#alternateVersionsContent', page).html(html).trigger('create').createPosterItemMenus();
             } else {
                 $('#alternateVersionsCollapsible', page).hide();
             }
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 90227fcd2a..534e208985 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -662,7 +662,7 @@
 
                 cssClass += ' ' + options.shape + 'PosterItem';
 
-                html += '<a data-itemid="' + item.Id + '" class="' + cssClass + '" data-locationtype="' + item.LocationType + '" data-mediatype="' + (item.MediaType || '') + '" href="' + LibraryBrowser.getHref(item, options.context) + '">';
+                html += '<a data-itemid="' + item.Id + '" class="' + cssClass + '" data-primaryversionid="' + (item.PrimaryVersionId || '') + '" data-locationtype="' + item.LocationType + '" data-mediatype="' + (item.MediaType || '') + '" href="' + LibraryBrowser.getHref(item, options.context) + '">';
 
                 // Ribbon
                 if (item.MediaType == "Video" && options.formatIndicators) {
@@ -717,6 +717,9 @@
                     html += LibraryBrowser.getPlayedIndicatorHtml(item);
                 }
 
+                if (item.AlternateVersionCount) {
+                    html += '<div class="alternateVersionIndicator">' + (item.AlternateVersionCount + 1) + '</div>';
+                }
                 if (item.IsUnidentified) {
                     html += '<div class="unidentifiedIndicator"><div class="ui-icon-alert ui-btn-icon-notext"></div></div>';
                 }
@@ -2118,17 +2121,19 @@
 
         items.push({ type: 'link', text: 'Images', url: 'edititemimages.html?id=' + id });
 
-        if (mediatype == 'Video' && elem.getAttribute('data-locationtype') == 'FileSystem') {
+        //if (mediatype == 'Video' && elem.getAttribute('data-locationtype') == 'FileSystem' && !elem.getAttribute('data-primaryversionid')) {
 
-            items.push({ type: 'divider' });
-            items.push({ type: 'header', text: 'Manage' });
-            items.push({ type: 'command', text: 'Alternate Editions', name: 'AlternateEditions' });
-        }
+        //    items.push({ type: 'divider' });
+        //    items.push({ type: 'header', text: 'Manage' });
+        //    items.push({ type: 'command', text: 'Alternate Versions', name: 'AlternateVersions' });
+        //}
 
         return items;
     }
 
-    $.fn.createPosterItemHoverMenu = function () {
+    $.fn.createPosterItemMenus = function (options) {
+
+        options = options || {};
 
         function onShowTimerExpired(elem) {
 
@@ -2186,18 +2191,20 @@
 
         var sequence = this;
 
-        //Dashboard.getCurrentUser().done(function (user) {
+        if (options.contextMenu !== false) {
+            Dashboard.getCurrentUser().done(function (user) {
 
-        //    if (user.Configuration.IsAdministrator) {
+                if (user.Configuration.IsAdministrator) {
 
-        //        sequence.createContextMenu({
-        //            getOptions: getMenuOptions,
-        //            command: onMenuCommand,
-        //            selector: '.posterItem'
-        //        });
-        //    }
+                    sequence.createContextMenu({
+                        getOptions: getMenuOptions,
+                        command: onMenuCommand,
+                        selector: '.posterItem'
+                    });
+                }
 
-        //});
+            });
+        }
 
         return this.on('mouseenter', '.backdropPosterItem,.smallBackdropPosterItem,.portraitPosterItem,.squarePosterItem', onHoverIn)
             .on('mouseleave', '.backdropPosterItem,.smallBackdropPosterItem,.portraitPosterItem,.squarePosterItem', onHoverOut);
diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js
index 6301efb79b..a4209f5b49 100644
--- a/dashboard-ui/scripts/livetvrecordinglist.js
+++ b/dashboard-ui/scripts/livetvrecordinglist.js
@@ -35,7 +35,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index c2ea8ccfd1..329a8420d7 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -58,7 +58,7 @@
             overlayText: true,
             coverImage: true
 
-        })).createPosterItemHoverMenu();
+        })).createPosterItemMenus();
     }
 
     function reload(page) {
diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js
index f720c8beb1..32b0e6fdab 100644
--- a/dashboard-ui/scripts/livetvseriestimer.js
+++ b/dashboard-ui/scripts/livetvseriestimer.js
@@ -127,7 +127,7 @@
             overlayText: true,
             coverImage: true
 
-        })).createPosterItemHoverMenu();
+        })).createPosterItemMenus();
     }
     
     function renderSchedule(page, result) {
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 4f10496b0a..9b230bee2c 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -23,7 +23,7 @@
 
             });
 
-            $('.activeProgramItems', page).html(html).createPosterItemHoverMenu();
+            $('.activeProgramItems', page).html(html).createPosterItemMenus();
         });
 
         apiClient.getLiveTvRecommendedPrograms({
@@ -46,7 +46,7 @@
 
             });
 
-            $('.upcomingProgramItems', page).html(html).createPosterItemHoverMenu();
+            $('.upcomingProgramItems', page).html(html).createPosterItemMenus();
         });
     }
 
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index cb065e1e93..ac9db18fc2 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -47,7 +47,7 @@
                 html += '<p>Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.</p>';
             }
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index ce03f7cdb3..24a5f882f2 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -67,7 +67,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/movieslatest.js b/dashboard-ui/scripts/movieslatest.js
index b2a0ed827d..0e4338ec47 100644
--- a/dashboard-ui/scripts/movieslatest.js
+++ b/dashboard-ui/scripts/movieslatest.js
@@ -23,7 +23,7 @@
                 items: result.Items,
                 useAverageAspectRatio: true
 
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
         });
 
 
@@ -50,7 +50,7 @@
                 items: result.Items,
                 useAverageAspectRatio: true
 
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
 
         });
 
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 8fee981033..aef9399419 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -68,7 +68,7 @@
                 overlayText: true,
                 showTitle: true
                 
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
 
         });
 
@@ -90,7 +90,7 @@
 
             var html = recommendations.map(getRecommendationHtml).join('');
 
-            $('.recommendations', page).html(html).createPosterItemHoverMenu();
+            $('.recommendations', page).html(html).createPosterItemMenus();
         });
     });
 
diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js
index 9f10aea207..2b3f150fa5 100644
--- a/dashboard-ui/scripts/movietrailers.js
+++ b/dashboard-ui/scripts/movietrailers.js
@@ -40,7 +40,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js
index d468834421..26f7b070b0 100644
--- a/dashboard-ui/scripts/musicalbumartists.js
+++ b/dashboard-ui/scripts/musicalbumartists.js
@@ -37,7 +37,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js
index 5cefbfc1e9..a8cdc6c399 100644
--- a/dashboard-ui/scripts/musicalbums.js
+++ b/dashboard-ui/scripts/musicalbums.js
@@ -57,7 +57,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js
index 592b9ade38..60d2fe572a 100644
--- a/dashboard-ui/scripts/musicartists.js
+++ b/dashboard-ui/scripts/musicartists.js
@@ -36,7 +36,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index c9d77bc121..e0deb355ee 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -25,7 +25,7 @@
                 shape: "square",
                 showTitle: true,
                 showParentTitle: true
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
 
         });
 
@@ -48,7 +48,7 @@
                 shape: "square",
                 showTitle: true,
                 showParentTitle: true
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
 
         });
 
@@ -78,7 +78,7 @@
                 shape: "square",
                 showTitle: true,
                 showParentTitle: true
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
 
         });
 
@@ -108,7 +108,7 @@
                 shape: "square",
                 showTitle: true,
                 showParentTitle: true
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
 
         });
 
diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js
index 68f0b34e4d..7bc9d4a26e 100644
--- a/dashboard-ui/scripts/tvlatest.js
+++ b/dashboard-ui/scripts/tvlatest.js
@@ -28,7 +28,7 @@
                 showParentTitle: true,
                 overlayText: true
 
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
 
         });
 
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index d31b11a908..68e9a02eb1 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -32,7 +32,7 @@
                 showParentTitle: true,
                 overlayText: true
 
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
 
         });
     }
@@ -65,7 +65,7 @@
                     showParentTitle: true,
                     overlayText: true
 
-                })).createPosterItemHoverMenu();
+                })).createPosterItemMenus();
 
             } else {
 
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index aaa75b4d2e..1e1a8ca3ab 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -70,7 +70,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
+            $('#items', page).html(html).trigger('create').createPosterItemMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js
index 1e39302e90..60e3abffa3 100644
--- a/dashboard-ui/scripts/tvupcoming.js
+++ b/dashboard-ui/scripts/tvupcoming.js
@@ -29,7 +29,7 @@
                 showPremiereDateIndex: true,
                 preferThumb: true
 
-            })).createPosterItemHoverMenu();
+            })).createPosterItemMenus();
         });
     });