diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html
index d144fe0a..78457458 100644
--- a/rowers/templates/embedded_video.html
+++ b/rowers/templates/embedded_video.html
@@ -262,67 +262,81 @@
     <input type="hidden" name="lock" id="lock" value="Lock">
   </li>
   {% endif %}
-  <li>
-    Data Time
-    <span id="datatime">
-    </span> seconds
-  </li>
-  <li>
-    Video Time
-    <span id="time">
-    </span> seconds
-  </li>
-  {% for id, metric in metrics.items %}
-  <li>
-    {{ metric.name }}
-    <span id="{{ id }}">
-    </span> {{ metric.unit }}
-  </li>
-  {% endfor %}
-  {% for group in metricsgroups %}
-  <li class="grid">
-    <canvas id="{{ group }}"></canvas>
-  </li>
-  {% endfor %}
 </ul>
 <p>&nbsp;</p>
 <form enctype="multipart/form-data" action="" method="post">
-<ul class="main-content">
-  {% if form and user.is_authenticated and user == workout.user.user %}
+  <ul class="main-content">
     <li class="grid_2">
+
+
+      {% if form and user.is_authenticated and user == workout.user.user %}
+
       <table>
         {{ form.as_table }}
       </table>
       {% csrf_token %}
+
+
+      <table>
+        {{ metricsform.as_table }}
+      </table>
+
+      {% else %}
+      <input type="hidden" id="id_delay" value="{{ analysis.delay }}">
+      {% endif %}
+
       {% if not analysis.id %}
       <input type="submit" name="reload_button" value="Reload">
       {% endif %}
       <input type="submit" name="save_button" value="Save">
+
+      {% if analysis and user.is_authenticated and user == analysis.workout.user.user %}
+      <p>
+        <a href="/rowers/video/{{ analysis.id }}/delete/">Delete Analysis</a>
+      </p>
+      {% endif %}
+
+
+
     </li>
-    <li class="grid_2">
-      <table>
-        {{ metricsform.as_table }}
-      </table>
+
+    <li class="grid_2" >
+      <ul class="main-content">
+      <li class="grid_2">
+        Data Time
+        <span id="datatime">
+        </span> seconds
+      </li>
+      <li class="grid_2">
+        Video Time
+        <span id="time">
+        </span> seconds
+      </li>
+      {% for id, metric in metrics.items %}
+      <li class="grid_2">
+        {{ metric.name }}
+        <span id="{{ id }}">
+        </span> {{ metric.unit }}
+      </li>
+      {% endfor %}
+      {% for group in metricsgroups %}
+      <li class="grid_2">
+        <canvas id="{{ group }}"></canvas>
+      </li>
+      {% endfor %}
+      </ul>
     </li>
-  {% else %}
-  <input type="hidden" id="id_delay" value="{{ analysis.delay }}">
-  {% endif %}
-  <li>
-    {% if analysis and user.is_authenticated and user == analysis.workout.user.user %}
-    <p>
-      <a href="/rowers/video/{{ analysis.id }}/delete/">Delete Analysis</a>
-    </p>
-    {% endif %}
-  </li>
-</ul>
+  </ul>
 </form>
-<script>
-  $(document).ready( function() {
-    // cookie reader
-    function createCookie(name,value,days) {
-      if (days) {
-        var date = new Date();
-        date.setTime(date.getTime()+(days*24*60*60*1000));
+<p>&nbsp;</p>
+
+  <script>
+    $(document).ready( function() {
+      // cookie reader
+      function createCookie(name,value,days) {
+        if (days) {
+          var date = new Date();
+          date.setTime(date.getTime()+(days*24*60*60*1000));
         var expires = "; expires="+date.toGMTString();
       }
       else var expires = "";