diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html
index 01a2f1d8..5164c65f 100644
--- a/rowers/templates/menu_workout.html
+++ b/rowers/templates/menu_workout.html
@@ -49,6 +49,11 @@
         </li>
         -->
       {% if user.is_authenticated and workout|may_edit:request %}
+      <li id="chart-image">
+        <a href="/rowers/workout/{{ workout.id }}/image">
+          <i class="fas fa-file-image fa-fw"></i>&nbsp;Upload Image
+        </a>
+      </li>
       <li id="workout-delete">
         <a href="/rowers/workout/{{ workout.id }}/delete">
           <i class="fas fa-trash-alt fa-fw"></i>&nbsp;Delete
@@ -117,11 +122,6 @@
         </a>
       </li>
       {% endif %}
-      <li id="chart-image">
-        <a href="/rowers/workout/{{ workout.id }}/image">
-          <i class="fas fa-file-image fa-fw"></i>&nbsp;Upload Image
-        </a>
-      </li>
     </ul>
   </li>
   <li class="has-children" id="export">
diff --git a/rowers/templates/summary_edit.html b/rowers/templates/summary_edit.html
index d4de5063..62957cca 100644
--- a/rowers/templates/summary_edit.html
+++ b/rowers/templates/summary_edit.html
@@ -87,6 +87,38 @@
       </pre>
     </p>
   </li>
+  <li class="grid_2">
+    <h1>Detailed Summary Edit</h1>
+    <p>This is still experimental and there are known bugs. Use at your own risk. Nothing is stored permanently until you hit Save on the summary above. You can use the restore original button to restore the original values.</p>
+    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals" method="post">
+      <table width=100%> 
+        <thead>
+          <tr>
+            <th>#</th><th>Time</th><th>Distance</th><th>Type</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for i in nrintervals|times %}
+          <tr>
+            <td>{{ i }}&nbsp;</td>
+	    <td>
+	      {% get_field_id i "intervalt_" detailform %}
+	    </td>
+	    <td>
+	      {% get_field_id i "intervald_" detailform %}
+	    </td>
+	    <td>
+	      {% get_field_id i "type_" detailform %}
+	    </td>
+          </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+      {% csrf_token %}
+      <input type="hidden" name="nrintervals" value={{ nrintervals }}>
+      <input class="button green" type="submit" value="Update">
+    </form>
+  </li>
   <li class="grid_4">
     <h1 id="howto">Interval Shorthand How-To</h1>
     <p>This is a quick way to enter the intervals using a special mini-language.</p>
diff --git a/rowers/views.py b/rowers/views.py
index 0b761670..8a7d3440 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -11961,7 +11961,11 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 	rowdata.updateintervaldata(ivalues,iunits,itypes,iresults=iresults)
 	intervalstats = rowdata.allstats()
 	row.summary = intervalstats
-	row.notes += "\n"+s
+	try:
+            row.notes += "\n"+s
+        except TypeError:
+            pass
+        
 	row.save()
 	rowdata.write_csv(f1,gzip=True)
         dataprep.update_strokedata(id,rowdata.df)