diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html
index e18454fc..56eb39e2 100644
--- a/rowers/templates/analysis.html
+++ b/rowers/templates/analysis.html
@@ -138,7 +138,19 @@
         Analyse power vs piece duration to make predictions, for erg pieces.
       </p>
     </div>
-    <div class="grid_2 suffix_2 alpha">
+    <div class="grid_2">
+      <p>
+        {% if user|is_planmember %}
+        <a class="button blue small" href="/rowers/fitness-progress">Power Progress</a>		
+        {% else %}
+        <a class="button blue small" href="/rowers/promembership">Power Progress</a>		
+        {% endif %}
+      </p>
+      <p>
+        Monitoring power duration evidence from all your workouts. Feel free to explore.
+      </p>
+    </div>
+    <div class="grid_2 omega">
       <p>
         {% if user|is_planmember %}
         <a class="button blue small" href="/rowers/laboratory">The Labs</a>		
diff --git a/rowers/templates/laboratory.html b/rowers/templates/laboratory.html
index 9b5b2964..1485f78a 100644
--- a/rowers/templates/laboratory.html
+++ b/rowers/templates/laboratory.html
@@ -24,13 +24,13 @@
     <div class="grid_2 alpha">
       <p>
         {% if user|is_planmember %}
-        <a class="button blue small" href="/rowers/fitness-progress">Power Progress</a>		
+        <a class="button blue small" href="/rowers/createplan">Training Target</a>		
         {% else %}
-        <a class="button blue small" href="/rowers/promembership">Power Progress</a>		
+        <a class="button blue small" href="/rowers/promembership">Training Target</a>		
         {% endif %}
       </p>
       <p>
-        Monitoring power duration evidence from all your workouts. Feel free to explore.
+        Experiments with a training target and plan builder
       </p>
     </div>
   </div>