diff --git a/tailbone/static/css/layout.css b/tailbone/static/css/layout.css
index cedd4d55..48c607e9 100644
--- a/tailbone/static/css/layout.css
+++ b/tailbone/static/css/layout.css
@@ -170,16 +170,10 @@ body > #body-wrapper {
  * Panels
  ******************************/
 
-.panel-wrapper {
-    float: left;
-    margin-right: 15px;
-    width: 40%;
-}
-
 .panel,
 .panel-grid {
     border-left: 1px solid Black;
-    margin-bottom: 15px;
+    margin-bottom: 1em;
 }
 
 .panel {
diff --git a/tailbone/templates/products/view.mako b/tailbone/templates/products/view.mako
index d734bb41..db73208f 100644
--- a/tailbone/templates/products/view.mako
+++ b/tailbone/templates/products/view.mako
@@ -1,55 +1,52 @@
 ## -*- coding: utf-8; -*-
 <%inherit file="/master/view.mako" />
 
-<%def name="extra_styles()">
-  ${parent.extra_styles()}
-  <style type="text/css">
-    #product-main {
-        margin-top: 1em;
-        width: 80%;
-    }
-    #product-image {
-        float: left;
-    }
-  </style>
-</%def>
-
 ##############################
 ## page body
 ##############################
 
-<div class="form-wrapper">
-  <ul class="context-menu">
+<div style="display: flex; justify-content: space-between;">
+
+  <div class="form-wrapper">
+
+    <div style="display: flex; flex-direction: column;">
+
+      <div class="panel" id="product-main">
+        <h2>Product</h2>
+        <div class="panel-body">
+          <div style="display: flex; justify-content: space-between;">
+            <div>
+              ${self.render_main_fields(form)}
+            </div>
+            <div>
+              % if image_url:
+                  ${h.image(image_url, "Product Image", id='product-image', width=150, height=150)}
+              % endif
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div style="display: flex;">
+        <div class="panel-wrapper"> <!-- left column -->
+          ${self.left_column()}
+        </div> <!-- left column -->
+        <div class="panel-wrapper" style="margin-left: 1em;"> <!-- right column -->
+          ${self.right_column()}
+        </div> <!-- right column -->
+      </div>
+
+    </div>
+
+    % if buttons:
+        ${buttons|n}
+    % endif
+  </div>
+
+  <ul id="context-menu">
     ${self.context_menu_items()}
   </ul>
 
-  <div class="panel" id="product-main">
-    <h2>Product</h2>
-    <div class="panel-body">
-      <div style="clear: none; float: left;">
-        ${self.render_main_fields(form)}
-      </div>
-      % if image_url:
-          ${h.image(image_url, "Product Image", id='product-image', width=150, height=150)}
-      % endif
-    </div>
-  </div>
-
-  <div class="panel-wrapper"> <!-- left column -->
-
-    ${self.left_column()}
-
-  </div> <!-- left column -->
-
-  <div class="panel-wrapper"> <!-- right column -->
-
-    ${self.right_column()}
-
-  </div> <!-- right column -->
-
-  % if buttons:
-      ${buttons|n}
-  % endif
 </div>
 
 ##############################