diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html
index ee0d3664..d598c144 100644
--- a/rowers/templates/analysis.html
+++ b/rowers/templates/analysis.html
@@ -11,18 +11,6 @@
 
 
 <ul class="main-content">
-  <li class="rounder">
-    <h2>Ranking Pieces</h2>
-      <a href="/rowers/ote-bests2/">
-        <div class="vignet">
-          <img src="/static/img/rankingpiece.png"
-               alt="Ranking Piece">
-        </div>
-      </a>
-    <p>
-      Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.
-    </p>
-  </li>
   <li class="rounder">
     <h2>Compare Workouts</h2>
     {% if team %}
@@ -85,29 +73,6 @@
       BETA: Box Chart Statistics of stroke metrics over a date range
     </p>
   </li>
-  <li class="rounder">
-    <h2>OTW Critical Power</h2>
-      <a href="/rowers/otw-bests/">
-      <div class="vignet">
-        <img src="/static/img/otwcp.png" alt="OTW Critical Power">
-      </div>
-      </a>
-    <p>
-      Analyse power vs piece duration to make predictions. For On-The-Water rowing.
-    </p>
-  </li>
-  <li class="rounder">
-    <h2>OTE Critical Power</h2>
-      <a href="/rowers/ote-ranking/">
-      <div class="vignet">
-        <img src="/static/img/otecp.png" alt="OTE Critical Power">
-      </div>
-      </a>
-
-    <p>
-      Analyse power vs piece duration to make predictions, for erg pieces.
-    </p>
-  </li>
   <li class="rounder">
     <h2>Trend Flex</h2>
       <a href="/rowers/user-multiflex-select/">
@@ -131,6 +96,41 @@
       Monitoring power duration evidence from all your workouts. Feel free to explore.
     </p>
   </li>
+  <li class="rounder">
+    <h2>Ranking Pieces</h2>
+      <a href="/rowers/ote-bests2/">
+        <div class="vignet">
+          <img src="/static/img/rankingpiece.png"
+               alt="Ranking Piece">
+        </div>
+      </a>
+    <p>
+      Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.
+    </p>
+  </li>
+  <li class="rounder">
+    <h2>OTW Critical Power</h2>
+      <a href="/rowers/otw-bests/">
+      <div class="vignet">
+        <img src="/static/img/otwcp.png" alt="OTW Critical Power">
+      </div>
+      </a>
+    <p>
+      Analyse power vs piece duration to make predictions. For On-The-Water rowing.
+    </p>
+  </li>
+  <li class="rounder">
+    <h2>OTE Critical Power</h2>
+      <a href="/rowers/ote-ranking/">
+      <div class="vignet">
+        <img src="/static/img/otecp.png" alt="OTE Critical Power">
+      </div>
+      </a>
+
+    <p>
+      Analyse power vs piece duration to make predictions, for erg pieces.
+    </p>
+  </li>
 </ul>
 
 
diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html
index 86bbd079..24b99117 100644
--- a/rowers/templates/menu_analytics.html
+++ b/rowers/templates/menu_analytics.html
@@ -5,20 +5,30 @@
   <li class="has-children" id="fitness">
     <input type="checkbox" name="group-fitness" id="group-fitness" checked>
     <label for="group-fitness">
-      <i class="fas fa-watch-fitness fa-fw"></i>&nbsp;Fitness</label>
+      <i class="fas fa-watch-fitness fa-fw"></i>&nbsp;Fitness
+    </label>
     <ul>
+      <li id="compare">
+	{% if team %}
+	<a href="/rowers/team-compare-select/team/{{ team.id }}/">
+          <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare
+        </a>
+	{% else %}
+	<a href="/rowers/team-compare-select/team/0/">
+          <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare
+        </a>
+	{% endif %}
+      </li>  
+      <li id="fitness-powerprogress">
+        <a href="/rowers/fitness-progress/">
+          <i class="far fa-watch-fitness fa-fw"></i>&nbsp;Power Progress
+        </a>
+      </li>
       <li id="fitness-ranking">
         <a href="/rowers/ote-bests2/">
           <i class="fas fa-star fa-fw"></i>&nbsp;Ranking Pieces
         </a>
       </li>
-      <li id="compare">
-	{% if team %}
-	<a href="/rowers/team-compare-select/team/{{ team.id }}/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
-	{% else %}
-	<a href="/rowers/team-compare-select/team/0/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
-	{% endif %}
-      </li>  
       <li id="fitness-otecp">
         <a href="/rowers/ote-ranking/">
           <i class="fas fa-user-chart fa-fw"></i>&nbsp;CP Chart OTE
@@ -29,11 +39,6 @@
           <i class="far fa-user-chart fa-fw"></i>&nbsp;CP Chart OTW
         </a>
       </li>
-      <li id="fitness-powerprogress">
-        <a href="/rowers/fitness-progress/">
-          <i class="far fa-watch-fitness fa-fw"></i>&nbsp;Power Progress
-        </a>
-      </li>
     </ul>
   </li>
   <li class="has-children" id="stats">