Index: ow/templates/add_manual_workout.pt
===================================================================
--- ow/templates/add_manual_workout.pt	(revision 2a71053706872811a3a2f76bf08ae2dd5d7b4a7e)
+++ ow/templates/add_manual_workout.pt	(revision 6edc36713ea2421dce15b738a7277974435b245d)
@@ -8,9 +8,9 @@
       tal:attributes="lang request.locale_name">
 
-  <metal:head-title metal:fill-slot="head-title">
+  <metal:head-title metal:fill-slot="head-title" metal:define-slot="head-title">
     <tal:t i18n:translate="">Add workout manually</tal:t>
   </metal:head-title>
 
-  <metal:title metal:fill-slot="title">
+  <metal:title metal:fill-slot="title" metal:define-slot="head-title">
     <tal:t i18n:translate="">Add workout Manually</tal:t>
   </metal:title>
@@ -26,7 +26,13 @@
     <div class="add_workout ow-forms">
       <a href="" class="back"
-             tal:attributes="href request.resource_url(context)"
-             i18n:translate="">Back</a>
-        <h2 i18n:translate="">Add a new workout</h2>
+         tal:attributes="href request.resource_url(context)"
+         i18n:translate="">Back</a>
+
+      <h2>
+        <metal:form-title metal:define-slot="form-title">
+          <tal:t i18n:translate="">Add a new workout</tal:t>
+        </metal:form-title>
+      </h2>
+
         ${form.begin()}
         ${form.csrf_token()}
@@ -43,5 +49,10 @@
               ${form.text('title')}
           </p>
-          <div class="input-container ly-flex ly-2 has-gap">
+          <div class="input-container ly-flex ly-3 has-gap">
+            <div>
+              <label for="distance" i18n:translate="">Distance (Km):</label>
+              ${form.errorlist('distance')}
+              ${form.text('distance', size=4, **{'class': "number"})}
+            </div>
               <div>
                   <label for="start_date" i18n:translate="">Start date (dd/mm/yyyy)</label>
@@ -73,10 +84,4 @@
             </div>
           </div>
-
-          <p>
-              <label for="distance" i18n:translate="">Distance (Km):</label>
-              ${form.errorlist('distance')}
-              ${form.text('distance', size=4, **{'class': "number"})}
-          </p>
           <div>
             <label for="notes" i18n:translate="">Notes:</label>
Index: ow/templates/delete_workout.pt
===================================================================
--- ow/templates/delete_workout.pt	(revision 2a71053706872811a3a2f76bf08ae2dd5d7b4a7e)
+++ ow/templates/delete_workout.pt	(revision 6edc36713ea2421dce15b738a7277974435b245d)
@@ -38,18 +38,10 @@
               </li>
               <li>
-                <tal:t i18n:translate="">End:</tal:t>
-                <tal:c tal:content="context.end_in_timezone(timezone)"></tal:c>
+                <tal:t i18n:translate="">Duration:</tal:t>
+                <tal:c tal:content="context._duration"></tal:c>
               </li>
               <li>
                 <tal:t i18n:translate="">Distance:</tal:t>
-                <tal:c tal:content="context.distance"></tal:c>
-              </li>
-              <li>
-                <tal:t i18n:translate="">Average Heart Rate:</tal:t>
-                <tal:c tal:content="context.hr_avg"></tal:c>
-              </li>
-              <li>
-                <tal:t i18n:translate="">Maximum Heart Rate:</tal:t>
-                <tal:c tal:content="context.hr_max"></tal:c>
+                <tal:c tal:content="context.rounded_distance"></tal:c>
               </li>
             </ul>
Index: ow/templates/edit_manual_workout.pt
===================================================================
--- ow/templates/edit_manual_workout.pt	(revision 2a71053706872811a3a2f76bf08ae2dd5d7b4a7e)
+++ ow/templates/edit_manual_workout.pt	(revision 6edc36713ea2421dce15b738a7277974435b245d)
@@ -23,3 +23,7 @@
   </metal:title>
 
+  <metal:form-title metal:fill-slot="form-title">
+    <tal:t i18n:translate="">Edit workout</tal:t>
+  </metal:form-title>
+
 </html>
Index: ow/templates/update_workout_from_file.pt
===================================================================
--- ow/templates/update_workout_from_file.pt	(revision 2a71053706872811a3a2f76bf08ae2dd5d7b4a7e)
+++ ow/templates/update_workout_from_file.pt	(revision 6edc36713ea2421dce15b738a7277974435b245d)
@@ -27,22 +27,33 @@
       ${form.csrf_token()}
 
+      <h2 tal:content="context.title"></h2>
+
       <div tal:condition="context.has_tracking_file"
            i18n:translate="">
-        <h2>Existing
-        <tal:filetype i18n:name="filetype"
-                      tal:content="context.tracking_filetype"></tal:filetype>
-        tracking file data</h2>
-        <p>
-          <tal:data i18n:name="start"
-                  tal:content="context.start"></tal:data>
-        </p>
-        <p>
-          <tal:data i18n:name="end"
-                  tal:content="context.end"></tal:data>
-        </p>
-        <p>
-          <tal:data i18n:name="distance"
-                  tal:content="context.distance"></tal:data> kms
-        </p>
+
+        <h3>Existing
+          <tal:filetype i18n:name="filetype"
+                        tal:content="context.tracking_filetype"></tal:filetype>
+          tracking file data</h3>
+
+        <ul class="workout-activity-summary" id=""
+            tal:attributes="id 'workout-' + context.workout_id + '-details'"
+            tal:define="timezone request.root[request.authenticated_userid].timezone">
+          <li>
+            <tal:t i18n:translate="">Start:</tal:t>
+            <tal:c tal:content="context.start_in_timezone(timezone)"></tal:c>
+          </li>
+          <li>
+            <tal:t i18n:translate="">Duration:</tal:t>
+            <tal:c tal:content="context._duration"></tal:c>
+          </li>
+          <li>
+            <tal:t i18n:translate="">Distance:</tal:t>
+            <tal:c tal:content="context.rounded_distance"></tal:c>
+          </li>
+        </ul>
+        <div id="" tal:content="context.notes"
+             tal:attributes="id 'workout-' + context.workout_id + '-notes'">
+        </div>
       </div>
 
