diff --git a/res/app/control-panes/info/info.jade b/res/app/control-panes/info/info.jade
index f48f5c09..6742cc30 100644
--- a/res/app/control-panes/info/info.jade
+++ b/res/app/control-panes/info/info.jade
@@ -17,7 +17,7 @@
             tr
               td(translate) Place
               td {{device.provider.name}}
-            tr
+            tr(ng-show='device.name && device.image')
               td
               td
                 button(ng-click='openDevicePhoto(device)').btn.btn-xs.btn-primary-outline
@@ -61,6 +61,9 @@
       .widget-content.padded-small
         table.table.table-condensed.table-hover.table-infocard
           tbody
+            tr
+              td(translate) Size
+              td {{device.display.inches}}''
             tr
               td(translate) Density
               td {{device.display.density | displayDensity}}
diff --git a/res/app/device-list/device-list-details-directive.js b/res/app/device-list/device-list-details-directive.js
index 599e8482..78cea979 100644
--- a/res/app/device-list/device-list-details-directive.js
+++ b/res/app/device-list/device-list-details-directive.js
@@ -68,9 +68,11 @@ module.exports = function DeviceListDetailsDirective(
           var id = e.target.parentNode.parentNode.parentNode.id
           var device = mapping[id]
 
-          var title = device.name
-          var enhancedPhoto800 = '/static/app/devices/photo/x800/' + device.image
-          LightboxImageService.open(title, enhancedPhoto800)
+          if (device.name && device.image) {
+            var title = device.name
+            var enhancedPhoto800 = '/static/app/devices/photo/x800/' + device.image
+            LightboxImageService.open(title, enhancedPhoto800)
+          }
         }
       }