diff --git a/rowers/templates/instroke_analysis.html b/rowers/templates/instroke_analysis.html
index 5e98c069..ff533b4a 100644
--- a/rowers/templates/instroke_analysis.html
+++ b/rowers/templates/instroke_analysis.html
@@ -12,28 +12,43 @@
 <ul class="main-content">
   {% if analyses %}
   {% for analysis in analyses %}
-  <li class="rounder" id="analysis_{{ analysis.id }}">
-    <h2>{{ analysis.name }}</h2>
-    <a class="small" href="/rowers/analyses/{{ analysis.id }}/delete/"
+  <li class="grid_4 divlines" id="analysis_{{ analysis.id }}">
+    {{ analysis.date }}
+    <div><h3>{{ analysis.name }}</h3></div>
+    <div class="analysiscontainer">
+      <div class="workoutelement">
+        <a class="small" href="/rowers/instrokeanalysis/{{ analysis.id }}/edit/"
+         title="Edit">
+        <i class="fas fa-pencil-alt fa-fw"></i>
+      </a>
+      </div>
+    <div class="workoutelement">
+      <a class="small" href="/rowers/instrokeanalysis/{{ analysis.id }}/delete/"
        title="Delete">
       <i class="fas fa-trash-alt fa-fw"></i>
     </a>
-    <hr>
-    <p>
+    </div>
+    <div class="workoutelement">
+        <span style="color:#555">Workout</span><br>
+    {{ analysis.workout }}
+    </div>
+    <div class="workoutelement">
+        <span style="color:#555">Metric</span><br>
+    {{ analysis.metric }}
+    </div>
+    <div class="workoutelement">
+        <span style="color:#555">Notes</span><br>
       {{ analysis.notes }}
-    </p>
-    <p>
-      Workout: {{ analysis.workout }}
-    </p>
-    <p>
-      {{ analysis.spm_min }} - {{ analysis.spm_max }} SPM,
+    </div>
+    <div class="workoutelement">
+      <span style="color:#555">SPM</span><br>
+      {{ analysis.spm_min }} - {{ analysis.spm_max }}
+    </div>
+    <div class="workoutelement">
+      <span style="color:#555">Time</span><br>
       {{ analysis.start_second|secondstotimestring }} - {{ analysis.end_second|secondstotimestring }}
-    <p>
-    <p id="date">
-      <span id="date">
-        {{ analysis.date }}
-      </span>
-    </p>
+    </div>
+    </div>
   </li>
   {% endfor %}
   {% else %}
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 6251ead6..01e942c5 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -1850,7 +1850,7 @@ def agegrouprecordview(request, sex='male', weightcategory='hwt',
 def instrokeanalysis_view(request, userid=0):
     r = getrequestrower(request, userid=userid)
 
-    analyses = InStrokeAnalysis.objects.filter(rower=r).order_by("-date")
+    analyses = InStrokeAnalysis.objects.filter(rower=r).order_by("-date","-id")
 
     breadcrumbs = [
         {
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index a157f4ae..a9086cc1 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -395,6 +395,14 @@ th.rotate > div > span {
       margin: 0px;
 }
 
+.analysiscontainer {
+    display: grid;
+    grid-template-columns: 50px repeat(auto-fit, minmax(calc((100% - 100px)/6), 1fr));
+      /* grid-template-columns: 50px repeat(auto-fit, minmax(100px, 1fr)) 50px; ????*/
+      padding: 5px;
+      margin: 0px;
+}
+
 .workoutelement {
     margin-left: auto;
     margin-right: auto;