diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 1e36ace9..d0db4df7 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1032,6 +1032,8 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
                 peakforceangle = savgol_filter(peakforceangle,windowsize,3)
                 driveenergy = savgol_filter(driveenergy,windowsize,3)
                 drivelength = savgol_filter(drivelength,windowsize,3)
+                totalangle = savgol_filter(totalangle,windowsize,3)
+                effectiveangle = savgol_filter(effectiveangle,windowsize,3)
             data['wash'] = wash
             data['catch'] = catch
             data['slip'] = slip
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 91b12e0b..951c04f8 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -966,7 +966,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
 		   line_dash=[6,6],line_width=2)
     y2means = y1means
 
-    xlabel = Label(x=370,y=130,x_units='screen',y_units='screen',
+    xlabel = Label(x=100,y=130,x_units='screen',y_units='screen',
                    text=xparam+": {x1mean:6.2f}".format(x1mean=x1mean),
                    background_fill_alpha=.7,
                    text_color='green',
@@ -978,7 +978,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
 
     plot.add_layout(y1means)
 
-    y1label = Label(x=370,y=100,x_units='screen',y_units='screen',
+    y1label = Label(x=100,y=100,x_units='screen',y_units='screen',
                     text=yparam1+": {y1mean:6.2f}".format(y1mean=y1mean),
                     background_fill_alpha=.7,
                     text_color='blue',
@@ -1018,8 +1018,8 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
 
 
 	plot.add_layout(y2means)
-        y2label = Label(x=370,y=70,x_units='screen',y_units='screen',
-                        text=yparam2+": {y2mean:6.2f}".format(y2mean=y2mean),
+        y2label = Label(x=100,y=70,x_units='screen',y_units='screen',
+                        text=axlabels[yparam2]+": {y2mean:6.2f}".format(y2mean=y2mean),
                         background_fill_alpha=.7,
                         text_color='red',
         )
@@ -1287,8 +1287,8 @@ def interactive_flex_chart2(id=0,promember=0,
 		   line_dash=[6,6],line_width=2)
     y2means = y1means
 
-    xlabel = Label(x=370,y=130,x_units='screen',y_units='screen',
-                    text=xparam+": {x1mean:6.2f}".format(x1mean=x1mean),
+    xlabel = Label(x=100,y=130,x_units='screen',y_units='screen',
+                    text=axlabels[xparam]+": {x1mean:6.2f}".format(x1mean=x1mean),
                     background_fill_alpha=.7,
                     text_color='green',
     )
@@ -1300,8 +1300,8 @@ def interactive_flex_chart2(id=0,promember=0,
 
     plot.add_layout(y1means)
 
-    y1label = Label(x=370,y=100,x_units='screen',y_units='screen',
-                    text=yparam1+": {y1mean:6.2f}".format(y1mean=y1mean),
+    y1label = Label(x=100,y=100,x_units='screen',y_units='screen',
+                    text=axlabels[yparam1]+": {y1mean:6.2f}".format(y1mean=y1mean),
                     background_fill_alpha=.7,
                     text_color='blue',
     )
@@ -1375,8 +1375,8 @@ def interactive_flex_chart2(id=0,promember=0,
 
 
 	plot.add_layout(y2means)
-        y2label = Label(x=370,y=70,x_units='screen',y_units='screen',
-                        text=yparam2+": {y2mean:6.2f}".format(y2mean=y2mean),
+        y2label = Label(x=100,y=70,x_units='screen',y_units='screen',
+                        text=axlabels[yparam2]+": {y2mean:6.2f}".format(y2mean=y2mean),
                         background_fill_alpha=.7,
                         text_color='red',
         )
diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html
index 923edcbb..52a8eeaa 100644
--- a/rowers/templates/flexchart3otw.html
+++ b/rowers/templates/flexchart3otw.html
@@ -68,11 +68,11 @@
       </div>
     </div>
 		
-    <div class="grid_2 dropdown">
+    <div id="left-y" class="grid_2 dropdown">
       <button class="grid_2 alpha button blue small dropbtn">Left</button>
       <div class="dropdown-content">
         {% for key, value in axchoicesbasic.items %}
-        {% if key not in noylist %}
+        {% if key not in noylist and key != 'None' %}
 	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ key }}/{{ yparam2 }}/{{ plottype }}">{{ value }}</a>
         {% endif %}
         {% endfor %}
@@ -93,12 +93,12 @@
       </div>
     </div>
     
-    <div class="grid_2 dropdown omega">
+    <div id="right-y" class="grid_2 dropdown omega">
       <button class="grid_2 alpha button blue small dropbtn">Right</button>
       <div class="dropdown-content">
         {% for key, value in axchoicesbasic.items %}
         {% if key not in noylist %}
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ key }}/{{ yparam2 }}/{{ plottype }}">{{ value }}</a>
+	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/{{ key }}/{{ plottype }}">{{ value }}</a>
         {% endif %}
         {% endfor %}
 	{% if promember %}