diff --git a/images/companies/blackberry.png b/images/companies/blackberry.png
new file mode 100644
index 0000000..5b484a2
Binary files /dev/null and b/images/companies/blackberry.png differ
diff --git a/images/companies/optimizely.png b/images/companies/optimizely.png
index caedcda..fbb739b 100644
Binary files a/images/companies/optimizely.png and b/images/companies/optimizely.png differ
diff --git a/index.html b/index.html
index a4a925a..bfee66e 100644
--- a/index.html
+++ b/index.html
@@ -152,21 +152,15 @@
       DETECT GPU FROM WEBGL DATA (EXPERIMENTAL FEATURE)
     </div>
     <div id="gpu-segment" class="ui tall stacked segment">
-      <div class="ui basic segment">
-        <div class="ui equal width stackable internally celled grid">
-          <div class="row">
-            <div class="column">
-              <div class="ui right aligned icon">
-                <i class="microchip icon"></i>
-                GPU
-              </div>
+      <div class="ui equal width stackable internally celled grid">
+        <div class="row">
+          <div class="column">
+            <div class="ui right aligned icon">
+              <i class="microchip icon"></i>
+              GPU
             </div>
-            <div class="column">
-              <div class="ui basic segment">
-                <img class="ui tiny centered image" id="gpu-img" src="">
-              </div>
-            </div>
-            <div class="column">
+            <img class="ui tiny centered image" id="gpu-img" src="">
+            <div class="ui center aligned header">
               <div id="gpu-txt"></div>
             </div>
           </div>
diff --git a/js/script.js b/js/script.js
index 3bc0377..1b3569a 100644
--- a/js/script.js
+++ b/js/script.js
@@ -73,9 +73,13 @@ $(document)
                 var vendor = result.device.vendor!=undefined?result.device.vendor:'-';
                 var model = result.device.model!==undefined?result.device.model:'-';
                 $('#device-txt').html('<span class="ui large label">' + vendor + '</span><span class="ui large label">' + model + '</span>');
-                $('#device-img').attr('src', 'images/companies/' + result.device.vendor.toLowerCase() + '.png').on('error', function () {
-                    $(this).attr('src', 'images/companies/default.png');
-                });
+                if (result.device.vendor) {
+                    $('#device-img').attr('src', 'images/companies/' + result.device.vendor.toLowerCase() + '.png').on('error', function () {
+                        $(this).attr('src', 'images/companies/default.png');
+                    });
+                } else {
+                    $('#device-img').attr('src', 'images/companies/default.png');
+                }
             } else {
                 $('#device-txt').text('-');
                 $('#device-img').attr('src', 'images/companies/default.png');