diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index 8f35141..c3f5062 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -13,26 +13,34 @@
     </head>
     <body>
     	<main class="page-pad">
+    		<h1>Camera Collection Admin</h1>
     		<div class="top-bar">
 				<div class="top-bar-left">
-					<ul class="menu expanded align-center">
+					<ul class="menu">
+						<li class="menu-text">Camera Collection</li>
 						<li class="{{ route starts with 'camera_' ? 'is-active' }}">
 							<a href="{{ path('camera_index') }}">Cameras</a>
 						</li>
-						<li class="{{ route starts with 'camera-type_' ? 'is-active' }}">
-							<a href="{{ path('camera-type_index') }}">Camera Types</a>
-						</li>
-						<li class="{{ route starts with 'lens_' ? 'is-active' }}">
-							<a href="{{ path('lens_index') }}">Lenses</a>
-						</li>
 						<li class="{{ route starts with 'flash_' ? 'is-active' }}">
 							<a href="{{ path('flash_index') }}">Flashes</a>
 						</li>
+						<li class="{{ route starts with 'lens_' ? 'is-active' }}">
+							<a href="{{ path('lens_index') }}">Lenses</a>
+						</li>
+						<li class="menu-text">Meta</li>
+						<li class="{{ route starts with 'camera-type_' ? 'is-active' }}">
+							<a href="{{ path('camera-type_index') }}">Camera Types</a>
+						</li>
+					</ul>
+				</div>
+				<div class="top-bar-right">
+					<ul class="menu centered">
+						<li class="menu-text">Previously Owned</li>
 						<li class="{{ route starts with 'previously-owned-camera' ? 'is-active' }}">
-							<a href="{{ path('previously-owned-camera_index') }}">Previously Owned Cameras</a>
+							<a href="{{ path('previously-owned-camera_index') }}">Cameras</a>
 						</li>
 						<li class="{{ route starts with 'previously-owned-lens' ? 'is-active' }}">
-							<a href="{{ path('previously-owned-lens_index') }}">Previously Owned Lenses</a>
+							<a href="{{ path('previously-owned-lens_index') }}">Lenses</a>
 						</li>
 					</ul>
 				</div>
diff --git a/app/Resources/views/camera/index.html.twig b/app/Resources/views/camera/index.html.twig
index 1907b9d..24f7e7d 100644
--- a/app/Resources/views/camera/index.html.twig
+++ b/app/Resources/views/camera/index.html.twig
@@ -1,9 +1,9 @@
 {% extends 'base.html.twig' %}
 
 {% block body %}
-    <h1>Cameras</h1>
+    <h2>Cameras</h2>
 
-    <div class="callout primary">
+    <div class="small callout primary">
     	<ul>
 			<li>
             	<a href="{{ path('camera_new') }}">Add a new camera</a>
@@ -11,7 +11,7 @@
 		</ul>
     </div>
 
-    <table>
+    <table class="hover scroll stack">
         <thead>
             <tr>
             	<th>Actions</th>
@@ -51,7 +51,7 @@
                 <td>{{ camera.notes }}</td>
                 <td>{{ camera.serial }}</td>
                 <td>{% if camera.formerlyOwned %}Yes{% else %}No{% endif %}</td>
-                <td>{{ camera.purchasePrice }}</td>
+                <td>${{ camera.purchasePrice }}</td>
                 <td>{{ camera.batteryType }}</td>
                 <td>{{ camera.filmFormat }}</td>
                 <td>{% if camera.received %}Yes{% else %}No{% endif %}</td>
diff --git a/app/Resources/views/camera/new.html.twig b/app/Resources/views/camera/new.html.twig
index cd586a2..811402c 100644
--- a/app/Resources/views/camera/new.html.twig
+++ b/app/Resources/views/camera/new.html.twig
@@ -1,9 +1,9 @@
 {% extends 'form.html.twig' %}
 
 {% block form %}
-    <h1>Add a Camera</h1>
+    <h2>Add a Camera</h2>
 
-    <div class="callout">
+    <div class="small callout">
         <ul>
         	<li>
             	<a href="{{ path('camera_index') }}">Back to the list</a>
@@ -11,7 +11,7 @@
 		</ul>
     </div>
 
-	<div class="primary callout">
+	<div class="large primary callout">
     {{ form_start(form) }}
         {{ form_widget(form) }}
         <button type="submit" class="button">Add</button>
diff --git a/app/Resources/views/camera/show.html.twig b/app/Resources/views/camera/show.html.twig
index e3f5854..29c555d 100644
--- a/app/Resources/views/camera/show.html.twig
+++ b/app/Resources/views/camera/show.html.twig
@@ -1,9 +1,9 @@
 {% extends 'form.html.twig' %}
 
 {% block form %}
-    <h1>Camera</h1>
+    <h2>Camera</h2>
 
-    <div class="callout">
+	<div class="callout">
 	    <ul>
 	    	<li>
 	            <a href="{{ path('camera_index') }}">Back to the list</a>
@@ -12,10 +12,18 @@
 	            <a href="{{ path('camera_edit', { 'id': camera.id }) }}">Edit</a>
 	        </li>
 	    </ul>
-    </div>
 
 
-	<div class="primary callout">
+		<hr />
+
+
+    	{{ form_start(delete_form) }}
+        	<button type="submit" class="alert button">Delete Camera</button>
+        {{ form_end(delete_form) }}
+	</div>
+
+
+	<div class="large primary callout">
 	    <table>
 	        <tbody>
 	            <tr>
@@ -78,9 +86,5 @@
 	    </table>
 	</div>
 
-    <div class="callout">
-    	{{ form_start(delete_form) }}
-        	<button type="submit" class="alert button">Delete Camera</button>
-        {{ form_end(delete_form) }}
-    </div>
+
 {% endblock %}
diff --git a/app/Resources/views/cameratype/index.html.twig b/app/Resources/views/cameratype/index.html.twig
index 33a1b8f..10c4029 100644
--- a/app/Resources/views/cameratype/index.html.twig
+++ b/app/Resources/views/cameratype/index.html.twig
@@ -3,7 +3,7 @@
 {% block body %}
     <h1>Camera Types</h1>
 
-	<div class="primary callout">
+	<div class="small primary callout">
 	    <ul>
 	        <li>
 	            <a href="{{ path('camera-type_new') }}">Add a Camera Type</a>
@@ -11,7 +11,7 @@
 	    </ul>
 	</div>
 
-    <table>
+    <table class="hover scroll stack">
         <thead>
             <tr>
             	<th>Actions</th>
diff --git a/app/Resources/views/cameratype/new.html.twig b/app/Resources/views/cameratype/new.html.twig
index 27df7f1..5a309e2 100644
--- a/app/Resources/views/cameratype/new.html.twig
+++ b/app/Resources/views/cameratype/new.html.twig
@@ -3,7 +3,7 @@
 {% block form %}
     <h1>Add a Camera Type</h1>
 
-    <div class="callout">
+    <div class="small callout">
 	    <ul>
 	        <li>
 	            <a href="{{ path('camera-type_index') }}">Back to the list</a>
@@ -11,7 +11,7 @@
 	    </ul>
 	</div>
 
-	<div class="callout primary">
+	<div class="large primary callout">
 	    {{ form_start(form) }}
 	        {{ form_widget(form) }}
 	        <button type="submit" class="button">Add</button>
diff --git a/app/Resources/views/cameratype/show.html.twig b/app/Resources/views/cameratype/show.html.twig
index 76f7d84..e939040 100644
--- a/app/Resources/views/cameratype/show.html.twig
+++ b/app/Resources/views/cameratype/show.html.twig
@@ -1,20 +1,28 @@
 {% extends 'form.html.twig' %}
 
 {% block form %}
-    <h1>Camera Type</h1>
+    <h2>Camera Type</h2>
 
     <div class="callout">
-    	<ul>
-	        <li>
+	    <ul>
+	    	<li>
 	            <a href="{{ path('camera-type_index') }}">Back to the list</a>
 	        </li>
 	        <li>
 	            <a href="{{ path('camera-type_edit', { 'id': cameraType.id }) }}">Edit</a>
 	        </li>
-    	</ul>
-    </div>
+	    </ul>
 
-	<div class="primary callout">
+
+		<hr />
+
+
+    	{{ form_start(delete_form) }}
+        	<button type="submit" class="alert button">Delete Camera Type</button>
+        {{ form_end(delete_form) }}
+	</div>
+
+	<div class="large primary callout">
 	    <table>
 	        <tbody>
 	            <tr>
@@ -28,10 +36,4 @@
 	        </tbody>
 	    </table>
 	</div>
-
-	<div class="callout">
-	    {{ form_start(delete_form) }}
-	    	<button type="submit" class="alert button">Delete Camera Type</button>
-	    {{ form_end(delete_form) }}
-    </div>
 {% endblock %}
diff --git a/app/Resources/views/flash/index.html.twig b/app/Resources/views/flash/index.html.twig
index ef497a6..4eb53ac 100644
--- a/app/Resources/views/flash/index.html.twig
+++ b/app/Resources/views/flash/index.html.twig
@@ -3,7 +3,7 @@
 {% block body %}
     <h1>Flashes list</h1>
 
-    <div class="primary callout">
+    <div class="small primary callout">
 	    <ul>
 	        <li>
 	            <a href="{{ path('flash_new') }}">Add a Flash</a>
@@ -11,7 +11,7 @@
 	    </ul>
     </div>
 
-    <table>
+    <table class="hover scroll stack">
         <thead>
             <tr>
             	<th>Actions</th>
diff --git a/app/Resources/views/flash/new.html.twig b/app/Resources/views/flash/new.html.twig
index 673c6f8..cd06c26 100644
--- a/app/Resources/views/flash/new.html.twig
+++ b/app/Resources/views/flash/new.html.twig
@@ -3,7 +3,7 @@
 {% block form %}
     <h1>Flash creation</h1>
 
-    <div class="callout">
+    <div class="small callout">
 	    <ul>
 	        <li>
 	            <a href="{{ path('flash_index') }}">Back to the list</a>
@@ -11,7 +11,7 @@
 	    </ul>
 	</div>
 
-	<div class="callout primary">
+	<div class="large primary callout">
 	    {{ form_start(form) }}
 	        {{ form_widget(form) }}
 	        <button type="submit" class="button">Add</button>
diff --git a/app/Resources/views/flash/show.html.twig b/app/Resources/views/flash/show.html.twig
index d108b37..e44dfa9 100644
--- a/app/Resources/views/flash/show.html.twig
+++ b/app/Resources/views/flash/show.html.twig
@@ -1,7 +1,7 @@
 {% extends 'form.html.twig' %}
 
 {% block form %}
-    <h1>Flash</h1>
+    <h2>Flash</h1>
 
     <div class="callout">
     	<ul>
@@ -12,9 +12,16 @@
 	            <a href="{{ path('flash_edit', { 'id': flash.id }) }}">Edit</a>
 	        </li>
     	</ul>
+
+    	<hr />
+
+
+    	{{ form_start(delete_form) }}
+        	<button type="submit" class="alert button">Delete Flash</button>
+        {{ form_end(delete_form) }}
     </div>
 
-	<div class="primary callout">
+	<div class="large primary callout">
 	    <table>
 	        <tbody>
 	            <tr>
@@ -73,10 +80,4 @@
 	    </table>
 	</div>
 
-    <div class="callout">
-	    {{ form_start(delete_form) }}
-	    	<button type="submit" class="alert button">Delete Flash</button>
-	    {{ form_end(delete_form) }}
-    </div>
-
 {% endblock %}
diff --git a/app/Resources/views/form.html.twig b/app/Resources/views/form.html.twig
index 3154f95..1292457 100644
--- a/app/Resources/views/form.html.twig
+++ b/app/Resources/views/form.html.twig
@@ -10,8 +10,8 @@
 
 {% block body %}
 <div class="grid-container">
-	<div class="x-grid">
-		<div class="medium-4">
+	<div class="x-grid grid-margin-x">
+		<div class="large-4 medium-6 cell">
 			{% block form %}{% endblock %}
 		</div>
 	</div>
diff --git a/app/Resources/views/lenses/index.html.twig b/app/Resources/views/lenses/index.html.twig
index 9315ab1..73c7504 100644
--- a/app/Resources/views/lenses/index.html.twig
+++ b/app/Resources/views/lenses/index.html.twig
@@ -3,7 +3,7 @@
 {% block body %}
     <h1>Lenses</h1>
 
-    <div class="primary callout">
+    <div class="small primary callout">
 	    <ul>
 	        <li>
 	            <a href="{{ path('lens_new') }}">Add a Lens</a>
@@ -11,11 +11,12 @@
 	    </ul>
     </div>
 
-    <table>
+    <table class="hover scroll stack">
         <thead>
             <tr>
             	<th>Actions</th>
                 <th>Id</th>
+                <th>Brand</th>
                 <th>Description</th>
                 <th>Aperture Range</th>
                 <th>Focal Range</th>
@@ -43,7 +44,8 @@
                     </ul>
                 </td>
                 <td><a href="{{ path('lens_show', { 'id': lense.id }) }}">{{ lense.id }}</a></td>
-                <td>{{ lense.brand }} {{ lense.coatings }} {{ lense.productLine }} {{ lense.model }}</td>
+                <td>{{ lense.brand }}</td>
+                <td>{{ lense.coatings }} {{ lense.productLine }} {{ lense.model }}</td>
                 <td>{{ lense.minFStop }} &mdash; {{ lense.maxFStop }}</td>
                 <td>{{ lense.minFocalLength }} &mdash; {{ lense.maxFocalLength }}</td>
                 <td>{{ lense.serial }}</td>
diff --git a/app/Resources/views/lenses/new.html.twig b/app/Resources/views/lenses/new.html.twig
index 9ed0bca..068ff19 100644
--- a/app/Resources/views/lenses/new.html.twig
+++ b/app/Resources/views/lenses/new.html.twig
@@ -3,7 +3,7 @@
 {% block form %}
     <h1>Add a Lens</h1>
 
-    <div class="callout">
+    <div class="small callout">
 	    <ul>
 	        <li>
 	            <a href="{{ path('lens_index') }}">Back to the list</a>
@@ -11,7 +11,7 @@
 	    </ul>
 	</div>
 
-	<div class="primary callout">
+	<div class="large primary callout">
 	    {{ form_start(form) }}
 	        {{ form_widget(form) }}
 	        <button type="submit" class="button">Add</button>
diff --git a/app/Resources/views/lenses/show.html.twig b/app/Resources/views/lenses/show.html.twig
index f0f8965..aa00008 100644
--- a/app/Resources/views/lenses/show.html.twig
+++ b/app/Resources/views/lenses/show.html.twig
@@ -1,7 +1,7 @@
 {% extends 'form.html.twig' %}
 
 {% block form %}
-    <h1>Lens</h1>
+    <h2>Lens</h2>
 
     <div class="callout">
     	<ul>
@@ -12,9 +12,15 @@
 	            <a href="{{ path('lens_edit', { 'id': lense.id }) }}">Edit</a>
 	        </li>
     	</ul>
+
+    	<hr>
+
+    	{{ form_start(delete_form) }}
+        	<button type="submit" class="alert button">Delete Lens</button>
+        {{ form_end(delete_form) }}
     </div>
 
-	<div class="primary callout">
+	<div class="large primary callout">
 	    <table>
 	        <tbody>
 	            <tr>
@@ -93,10 +99,4 @@
 	    </table>
 	</div>
 
-    <div class="callout">
-        {{ form_start(delete_form) }}
-        	<button type="submit" class="alert button">Delete Lens</button>
-        {{ form_end(delete_form) }}
-    </div>
-
 {% endblock %}
diff --git a/app/Resources/views/previouslyownedcamera/index.html.twig b/app/Resources/views/previouslyownedcamera/index.html.twig
index 54e0241..7ca5ab7 100644
--- a/app/Resources/views/previouslyownedcamera/index.html.twig
+++ b/app/Resources/views/previouslyownedcamera/index.html.twig
@@ -3,7 +3,7 @@
 {% block body %}
     <h1>Previously Owned Cameras</h1>
 
-    <table>
+    <table class="hover scroll stack">
         <thead>
             <tr>
             	<th>Actions</th>
diff --git a/app/Resources/views/previouslyownedcamera/show.html.twig b/app/Resources/views/previouslyownedcamera/show.html.twig
index dc46bd8..22a7b57 100644
--- a/app/Resources/views/previouslyownedcamera/show.html.twig
+++ b/app/Resources/views/previouslyownedcamera/show.html.twig
@@ -1,7 +1,7 @@
 {% extends 'form.html.twig' %}
 
 {% block form %}
-    <h1>Previously Owned Camera</h1>
+    <h2>Previously Owned Camera</h2>
 
     <div class="callout">
     	<ul>
@@ -14,7 +14,7 @@
     	</ul>
     </div>
 
-	<div class="primary callout">
+	<div class="large primary callout">
 	    <table>
 	        <tbody>
 	            <tr>
diff --git a/app/Resources/views/previouslyownedlenses/index.html.twig b/app/Resources/views/previouslyownedlenses/index.html.twig
index cbd74e4..b456be3 100644
--- a/app/Resources/views/previouslyownedlenses/index.html.twig
+++ b/app/Resources/views/previouslyownedlenses/index.html.twig
@@ -3,7 +3,7 @@
 {% block body %}
     <h1>Previously Owned Lenses</h1>
 
-    <table>
+    <table class="hover scroll stack">
         <thead>
             <tr>
             	<th>Actions</th>
diff --git a/app/Resources/views/previouslyownedlenses/show.html.twig b/app/Resources/views/previouslyownedlenses/show.html.twig
index e4ea59c..68377d0 100644
--- a/app/Resources/views/previouslyownedlenses/show.html.twig
+++ b/app/Resources/views/previouslyownedlenses/show.html.twig
@@ -1,7 +1,7 @@
 {% extends 'form.html.twig' %}
 
 {% block form %}
-    <h1>Previously Owned Lens</h1>
+    <h2>Previously Owned Lens</h2>
 
     <div class="callout">
 	    <ul>
@@ -14,7 +14,7 @@
 	    </ul>
     </div>
 
-	<div class="primary callout">
+	<div class="large primary callout">
 	    <table>
 	        <tbody>
 	            <tr>
@@ -43,7 +43,7 @@
 	            </tr>
 	            <tr>
 	                <th>Focal Range</th>
-	                <td>{{ previouslyOwnedLense.minFocalLength }} &mdash; {{ previouslyOwnedLense.maxFocalLength }}</td>
+	                <td>{{ previouslyOwnedLense.minFocalLength }} &mdash; {{ previouslyOwnedLense.maxFocalLength }}mm</td>
 	            </tr>
 	            <tr>
 	                <th>Serial</th>
