diff --git a/static/directives/image-vulnerability-view.html b/static/directives/image-vulnerability-view.html
index 919dd1966..321289018 100644
--- a/static/directives/image-vulnerability-view.html
+++ b/static/directives/image-vulnerability-view.html
@@ -105,7 +105,7 @@
             <span class="fixed-in-version" bo-if="vuln.fixedInVersion" bo-text="vuln.fixedInVersion"></span>
          </td>
          <td class="double-col image-col hidden-xs hidden-sm hidden-md">
-            <span data-title="{{ vuln.imageCommand }}" bs-tooltip>
+            <span data-title="{{ vuln.imageCommand }}" data-container="body" bs-tooltip>
               <span class="dockerfile-command" command="vuln.imageCommand"></span>
             </span>
             <a href="/repository/{{ repository.namespace }}/{{ repository.name }}/image/{{ vuln.imageId }}"><i class="fa fa-archive"></i></a>
diff --git a/static/js/directives/ui/image-vulnerability-view.js b/static/js/directives/ui/image-vulnerability-view.js
index 2932b8c4e..991b487ee 100644
--- a/static/js/directives/ui/image-vulnerability-view.js
+++ b/static/js/directives/ui/image-vulnerability-view.js
@@ -157,13 +157,15 @@ angular.module('quay').directive('imageVulnerabilityView', function () {
               'addedBy': feature.AddedBy
             }
 
-            feature_vulnerabilities = []
+            feature_vulnerabilities = [];
 
             if (feature.Vulnerabilities) {
               feature.Vulnerabilities.forEach(function(vuln) {
-                var score = VulnerabilityService.LEVELS[vuln['Severity']]['score'];
+                var severity = VulnerabilityService.LEVELS[vuln['Severity']];
+                var score = severity.score;
                 if (vuln.Metadata && vuln.Metadata.NVD && vuln.Metadata.NVD.CVSSv2 && vuln.Metadata.NVD.CVSSv2.Score) {
                   score = vuln.Metadata.NVD.CVSSv2.Score;
+                  severity = VulnerabilityService.getSeverityForCVSS(score);
                 }
 
                 var imageId = feature.AddedBy.split('.')[0];
@@ -190,25 +192,25 @@ angular.module('quay').directive('imageVulnerabilityView', function () {
                 feature_vulnerabilities.push(vuln_obj)
                 $scope.securityVulnerabilities.push(vuln_obj);
 
-                if (severityMap[vuln.Severity] == undefined) {
-                  severityMap[vuln.Severity] = 0;
+                if (severityMap[severity['index']] == undefined) {
+                  severityMap[severity['index']] = 0;
                 }
 
-                severityMap[vuln.Severity]++;
+                severityMap[severity['index']]++;
               });
             }
 
-            feature_obj['vulnerabilities'] = feature_vulnerabilities
+            feature_obj['vulnerabilities'] = feature_vulnerabilities;
             $scope.securityFeatures.push(feature_obj);
           });
 
           var levels = VulnerabilityService.getLevels();
           for (var i = 0; i < levels.length; ++i) {
-            if (severityMap[levels[i].title]) {
+            if (severityMap[levels[i]['index']]) {
               $scope.priorityBreakdown.push({
                 'label': levels[i].title,
-                'value': severityMap[levels[i].title],
-                'color': levels[i].color,
+                'value': severityMap[levels[i]['index']],
+                'color': levels[i].color
               })
             }
           }
diff --git a/static/js/services/image-metadata-service.js b/static/js/services/image-metadata-service.js
index f8a1e1a33..e3bf18706 100644
--- a/static/js/services/image-metadata-service.js
+++ b/static/js/services/image-metadata-service.js
@@ -40,7 +40,7 @@ angular.module('quay').factory('ImageMetadataService', ['UtilService', function(
     if (!command) { return ''; }
 
     // ["/bin/sh", "-c", "#(nop) RUN foo"]
-    var commandPrefix = '#(nop)'
+    var commandPrefix = '#(nop)';
 
     if (command.length != 3) { return  ''; }
     if (command[0] != '/bin/sh' || command[1] != '-c') { return ''; }
diff --git a/static/js/services/vulnerability-service.js b/static/js/services/vulnerability-service.js
index b6cf51f6f..1a03bdfad 100644
--- a/static/js/services/vulnerability-service.js
+++ b/static/js/services/vulnerability-service.js
@@ -75,7 +75,7 @@ angular.module('quay').factory('VulnerabilityService', ['Config', function(Confi
     }
 
     classes += option.severity;
-    return classes
+    return classes;
   };
 
   vulnService.getVectorOptions = function(vectorString) {