diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index ad6a391273..471d648a2a 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -167,7 +167,7 @@
 
 @media all and (min-width: 650px) {
     .libraryPage .ui-content {
-        padding: 10px 20px 100px;
+        padding: 0 20px 100px;
     }
 
     .viewControls, .listTopPaging {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index e639661343..3469e8f619 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -379,7 +379,14 @@
 
             if (type == 'Backdrop') {
                 options.tag = item.BackdropImageTags[index];
-            } else {
+            }
+            else if (type == 'Screenshot') {
+                options.tag = item.ScreenshotImageTags[index];
+            }
+            else if (type == 'Primary') {
+                options.tag = item.PrimaryImageTag || item.ImageTags[type];
+            }
+            else {
                 options.tag = item.ImageTags[type];
             }