diff --git a/assets/styles/rimmington.sass b/assets/styles/rimmington.sass
index bfdb469..8ccf59a 100644
--- a/assets/styles/rimmington.sass
+++ b/assets/styles/rimmington.sass
@@ -13,4 +13,5 @@ table
 #wrapper
   background: white
   padding: 1.5rem 2rem
+  border: 1px solid #bbb
   border-radius: 8px
diff --git a/views/benchmark/add.erb b/views/benchmark/add.erb
index a6014b2..2e58fa6 100644
--- a/views/benchmark/add.erb
+++ b/views/benchmark/add.erb
@@ -30,7 +30,11 @@
       </div>
     </div>
 
-    <input class="btn btn-primary" type="submit" value="Create Benchmark">
+    <div class="row">
+      <div class="col-12">
+        <input class="btn btn-primary w-100" type="submit" value="Create Benchmark">
+      </div>
+    </div>
   </form>
 
 </div>
diff --git a/views/benchmark/edit.erb b/views/benchmark/edit.erb
index 07d0946..c397f5e 100644
--- a/views/benchmark/edit.erb
+++ b/views/benchmark/edit.erb
@@ -30,7 +30,11 @@
       </div>
     </div>
 
-    <input class="btn btn-primary" type="submit" value="Submit Changes">
+    <div class="row">
+      <div class="col-12">
+        <input class="btn btn-primary w-100" type="submit" value="Submit Changes">
+      </div>
+    </div>
   </form>
 
 </div>
diff --git a/views/hardware/add.erb b/views/hardware/add.erb
index 52d7ba2..7b138b3 100644
--- a/views/hardware/add.erb
+++ b/views/hardware/add.erb
@@ -22,7 +22,11 @@
       </div>
     </div>
 
-    <input class="btn btn-primary" type="submit" value="Create Hardware">
+    <div class="row">
+      <div class="col-12">
+        <input class="btn btn-primary w-100" type="submit" value="Create Hardware">
+      </div>
+    </div>
   </form>
 
 </div>
diff --git a/views/hardware/edit.erb b/views/hardware/edit.erb
index b4e83cd..269366f 100644
--- a/views/hardware/edit.erb
+++ b/views/hardware/edit.erb
@@ -22,7 +22,11 @@
       </div>
     </div>
 
-    <input class="btn btn-primary" type="submit" value="Create Hardware">
+    <div class="row">
+      <div class="col-12">
+        <input class="btn btn-primary w-100" type="submit" value="Submit Changes">
+      </div>
+    </div>
   </form>
 
 </div>
diff --git a/views/test/add.erb b/views/test/add.erb
index 69dc703..6c9e2d0 100644
--- a/views/test/add.erb
+++ b/views/test/add.erb
@@ -7,13 +7,13 @@
 <div class="row">
 
   <form class="col-12" action="/test/add" method="post">
-    <div class="row mb-3">
-      <div class="col-12 col-md-6 mb-3">
+    <div class="row mb-0 mb-md-3">
+      <div class="col-12 col-md-6 mb-3 mb-md-0">
         <label for="test_name">Test name</label>
         <input id="test_name" class="form-control" type="text" name="test_name" placeholder="My hardware test (01/99)">
       </div>
 
-      <div class="col-12 col-md-6 mb-3">
+      <div class="col-12 col-md-6 mb-3 mb-md-0">
         <label for="test_hardware">Hardware to test</label>
         <select id="test_hardware" class="form-select" name="test_hardware">
           <% for h in hardware %>
@@ -21,8 +21,10 @@
           <% end %>
         </select>
       </div>
+    </div>
 
-      <div class="col-12 col-md-4 mb-3">
+    <div class="row mb-0 mb-md-3">
+      <div class="col-12 col-md-4 mb-3 mb-md-0">
         <label for="test_benchmarks">Benchmarks</label>
         <select id="test_benchmarks" class="form-select" name="test_benchmarks[]" multiple>
           <% for b in benchmarks %>
@@ -31,14 +33,15 @@
         </select>
       </div>
 
-      <div class="col-12 col-md-8 mb-3">
+      <div class="col-12 col-md-8 mb-3 mb-md-0">
         <label for="test_description">Test description</label>
         <textarea id="test_description" class="form-control" name="test_description" placeholder="This is my test for a hardware..."></textarea>
+      </div>
     </div>
 
     <div class="row">
       <div class="col-12">
-        <input class="btn btn-primary" type="submit" value="Create Test">
+        <input class="btn btn-primary w-100" type="submit" value="Create Test">
       </div>
     </div>
   </form>
diff --git a/views/test/edit.erb b/views/test/edit.erb
index de842b3..23cde7e 100644
--- a/views/test/edit.erb
+++ b/views/test/edit.erb
@@ -1,32 +1,32 @@
-<div class="grid-x grid-margin-x">
-  <div class="cell small-12">
+<div class="row">
+  <div class="col-12">
     <h1>Editing: <%= hardware.name %></h1>
   </div>
 </div>
 
-<div class="grid-x grid-margin-x">
+<div class="row">
 
-  <form class="cell small-12" action="/hardware/<%= hardware.id %>/edit" method="post">
-    <div class="grid-x grid-padding-x">
-      <div class="cell medium-9">
-        <label>
-          Hardware name
-          <input type="text" name="hardware_name" placeholder="Example hardware" value="<%= hardware.name %>">
-        </label>
+  <form class="col-12" action="/hardware/<%= hardware.id %>/edit" method="post">
+    <div class="row mb-3">
+      <div class="col-12 col-md-9">
+        <label for="hardware_name">Hardware name</label>
+        <input id="hardware_name" class="form-control" type="text" name="hardware_name" placeholder="Example hardware" value="<%= hardware.name %>">
       </div>
 
-      <div class="cell medium-3">
-        <label>
-          Type
-          <select name="hardware_type">
-            <option value="gpu" <% if hardware.type == 'gpu' %>selected<% end %>>Graphics card</option>
-            <option value="cpu" <% if hardware.type == 'cpu' %>selected<% end %>>Processor</option>
-          </select>
-        </label>
+      <div class="col-12 col-md-3">
+        <label for="hardware_type">Type</label>
+        <select id="hardware_type" class="form-control" name="hardware_type">
+          <option value="gpu" <% if hardware.type == 'gpu' %>selected<% end %>>Graphics card</option>
+          <option value="cpu" <% if hardware.type == 'cpu' %>selected<% end %>>Processor</option>
+        </select>
       </div>
     </div>
 
-    <input type="submit" class="button" value="Submit">
+    <div class="row">
+      <div class="col-12">
+        <input class="btn btn-primary w-100" type="submit" value="Submit Changes">
+      </div>
+    </div>
   </form>
 
 </div>
diff --git a/views/test/index.erb b/views/test/index.erb
index 318ca75..7717b15 100644
--- a/views/test/index.erb
+++ b/views/test/index.erb
@@ -26,7 +26,7 @@
           <% tests.each do |t| %>
             <tr>
               <td><a href="/test/<%= t.id %>"><%= t.name %></a></td>
-              <td><%= t.benchmark.length %></td>
+              <td><%= t.benchmarks.length %></td>
               <td><%= date_format(t.created_at) %></td>
               <td><%= date_format(t.updated_at) %></td>
             </tr>