diff --git a/assets/coffee/storage.coffee b/assets/coffee/storage.coffee
index 38925f8..e8c3087 100644
--- a/assets/coffee/storage.coffee
+++ b/assets/coffee/storage.coffee
@@ -19,7 +19,7 @@ loadDisks = () ->
       i = 0
       while i < data.length
         optionElem = document.createElement('option')
-        diskName = data[i].name + '(' + data[i].device + ')'
+        diskName = data[i].name + ' (' + data[i].device + ')'
         optionElem.innerText = diskName
         optionElem.setAttribute('value', i)
         document.getElementById('diskSelector').appendChild(optionElem)
diff --git a/assets/twig/cpu.twig b/assets/twig/cpu.twig
index eb3ee9e..d0c5f0a 100644
--- a/assets/twig/cpu.twig
+++ b/assets/twig/cpu.twig
@@ -15,7 +15,7 @@
 <section class="row">
   <article class="columns eight">
     <h5>CPU Model: <span id="cpuInfo">Random CPU</span></h5>
-    <table class="hardware-info">
+    <table class="hardware-info u-full-width">
       <tbody>
         <tr>
           <td>Physical cores</td>
diff --git a/assets/twig/gpu.twig b/assets/twig/gpu.twig
index 8b04154..6e0c309 100644
--- a/assets/twig/gpu.twig
+++ b/assets/twig/gpu.twig
@@ -14,23 +14,25 @@
 </header>
 
 <section class="row">
-  <h5>GPU Model: <span id="gpuInfo">Random GPU</span></h5>
-  <table class="hardware-info">
-    <tbody>
-      <tr>
-        <td>GPU vendor</td>
-        <td><span id="gpuVendor">N/a</span></td>
-      </tr>
-      <tr>
-        <td>GPU memory</td>
-        <td><span id="gpuVram">N/a</span></td>
-      </tr>
-      <tr>
-        <td>Bus</td>
-        <td><span id="gpuBus">N/a</span></td>
-      </tr>
-    </tbody>
-  </table>
+  <article class="columns twelve">
+    <h5>GPU Model: <span id="gpuInfo">Random GPU</span></h5>
+    <table class="hardware-info u-full-width">
+      <tbody>
+        <tr>
+          <td>GPU vendor</td>
+          <td><span id="gpuVendor">N/a</span></td>
+        </tr>
+        <tr>
+          <td>GPU memory</td>
+          <td><span id="gpuVram">N/a</span></td>
+        </tr>
+        <tr>
+          <td>Bus</td>
+          <td><span id="gpuBus">N/a</span></td>
+        </tr>
+      </tbody>
+    </table>
+  </article>
 </section>
 
 <section class="row">
diff --git a/assets/twig/storage.twig b/assets/twig/storage.twig
index 98ed770..5aa4c73 100644
--- a/assets/twig/storage.twig
+++ b/assets/twig/storage.twig
@@ -14,27 +14,29 @@
 </header>
 
 <section class="row">
-  <h5>Device Model: <span id="diskInfo">Loading...</span></h5>
-  <table class="hardware-info">
-    <tbody>
-      <tr>
-        <td>Disk Path</td>
-        <td><span id="diskPath">N/a</span></td>
-      </tr>
-      <tr>
-        <td>Device Type</td>
-        <td><span id="diskType">N/a</span></td>
-      </tr>
-      <tr>
-        <td>Capacity</td>
-        <td><span id="diskSize">N/a</span></td>
-      </tr>
-      <tr>
-        <td>Vendor</td>
-        <td><span id="diskVendor">N/a</span></td>
-      </tr>
-    </tbody>
-  </table>
+  <article class="columns twelve">
+    <h5>Device Model: <span id="diskInfo">Loading...</span></h5>
+    <table class="hardware-info u-full-width">
+      <tbody>
+        <tr>
+          <td>Disk Path</td>
+          <td><span id="diskPath">N/a</span></td>
+        </tr>
+        <tr>
+          <td>Device Type</td>
+          <td><span id="diskType">N/a</span></td>
+        </tr>
+        <tr>
+          <td>Capacity</td>
+          <td><span id="diskSize">N/a</span></td>
+        </tr>
+        <tr>
+          <td>Vendor</td>
+          <td><span id="diskVendor">N/a</span></td>
+        </tr>
+      </tbody>
+    </table>
+  </article>
 </section>
 
 <section class="row">