diff --git a/rowers/models.py b/rowers/models.py
index af0b3374..83e699e3 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -358,9 +358,9 @@ class FavoriteForm(ModelForm):
         model = FavoriteChart
         fields = ['xparam','yparam1','yparam2',
                   'plottype','workouttype','reststrokes','notes']
-        widgets = {
-	    'notes': forms.Textarea,
-	    }
+#        widgets = {
+#	    'notes': forms.Textarea,
+#	    }
 
 
 # To generate favorite chart forms on the fly
diff --git a/rowers/templates/favoritecharts.html b/rowers/templates/favoritecharts.html
index 0ce6512d..efe81047 100644
--- a/rowers/templates/favoritecharts.html
+++ b/rowers/templates/favoritecharts.html
@@ -5,6 +5,11 @@
 {% block content %}
 <form method="post">
   {% csrf_token %}
+  <div class="grid_12 alpha">
+    <div class="grid_4 fav-form-header">
+      <p><input type="submit" value="Update Favorites" class="button green small"/></p>
+    </div>
+  </div>
   {{ favorites_formset.management_form }}
 
   {% for favorites_form in favorites_formset %}
@@ -18,11 +23,6 @@
   <div class="grid_12 alpha">
     <p>&nbsp;</p>
   </div>
-  <div class="grid_12 alpha">
-    <div class="grid_2">
-      <p><input type="submit" value="Update Favorites" class="button green small"/></p>
-    </div>
-  </div>
 </form>
 
 
@@ -37,4 +37,5 @@
     });
 </script>
 
+
 {% endblock %}
diff --git a/rowers/templates/flexchart.html b/rowers/templates/flexchart.html
deleted file mode 100644
index 479cc35b..00000000
--- a/rowers/templates/flexchart.html
+++ /dev/null
@@ -1,95 +0,0 @@
-{% extends "base.html" %}
-{% load staticfiles %}
-{% load rowerfilters %}
-
-{% block title %} Flexible Plot {% endblock %}
-
-{% block content %}
-
-	<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
-	<script async="true" type="text/javascript">
-    Bokeh.set_log_level("info");
-	</script>
-
-	{{ interactiveplot |safe }}
-
-    <script>
-    // Set things up to resize the plot on a window resize. You can play with
-    // the arguments of resize_width_height() to change the plot's behavior.
-    var plot_resize_setup = function () {
-        var plotid = Object.keys(Bokeh.index)[0]; // assume we have just one plot
-        var plot = Bokeh.index[plotid];
-        var plotresizer = function() {
-            // arguments: use width, use height, maintain aspect ratio
-            plot.resize_width_height(true, true, false);
-        };
-        window.addEventListener('resize', plotresizer);
-        plotresizer();
-    };
-    window.addEventListener('load', plot_resize_setup);
-    </script>
-    <style>
-    /* Need this to get the page in "desktop mode"; not having an infinite height.*/
-    html, body {height: 100%; margin:5px;}
-    </style>
-
-<div id="navigation" class="grid_12 alpha">
-	{% if user.is_authenticated and mayedit %}
-	<div class="grid_2 alpha">
-	<p>
-	<a class="button gray small" href="/rowers/workout/{{ id }}/edit">Edit Workout</a>
-</p>
-	</div>
-	<div class="grid_2 suffix_8 omega">
-	<p>
-	<a class="button gray small" href="/rowers/workout/{{ id }}/advanced">Advanced Edit</a>
-</p>
-
-	</div>
-	{% endif %}
-</div>
-
-
-<p>&nbsp;</p>
-
-<div id="plotbuttons" class="grid_12 alpha">
-
-
-	<div id="x-axis" class="grid_6 alpha">
-		<div class="grid_2 alpha">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/time/{{ yparam1 }}/{{ yparam2 }}">Time</a>
-		</div>
-		<div class="grid_2">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/distance/{{ yparam1 }}/{{ yparam2 }}">Distance</a>
-		</div>
-		<div class="grid_2 omega">
-		<a class="button blue small" 
-		href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam2 }}/{{ yparam1 }}">Swap Y axes</a>
-		</div>
-	</div>
-
-	<div id="y-axis" class="grid_6 omega">
-		<div class="grid_1 prefix_2 alpha">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/pace">Pace</a>
-		</div>
-		<div class="grid_1">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/hr">HR</a>
-		</div>
-		<div class="grid_1">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/spm">SPM</a>
-		</div>
-		<div class="grid_1 omega">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/power">Power</a>
-		</div>
-	</div>
-
-</div>
-
-<div id="theplot" class="grid_12 alpha">
-
-
-    {{ the_div|safe }}
-
-</div>
-
-{% endblock %}
\ No newline at end of file
diff --git a/rowers/templates/flexchart3.html b/rowers/templates/flexchart3.html
deleted file mode 100644
index 37aaac5c..00000000
--- a/rowers/templates/flexchart3.html
+++ /dev/null
@@ -1,208 +0,0 @@
-{% extends "base.html" %}
-{% load staticfiles %}
-{% load rowerfilters %}
-{% load tz %}
-
-{% block title %} Flexible Plot {% endblock %}
-
-{% localtime on %}
-{% block content %}
-
-{{ js_res | safe }}
-{{ css_res| safe }}
-
-<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
-<script type="text/javascript" src="/static/js/bokeh-widgets-0.12.3.min.js"></script>
-<script async="true" type="text/javascript">
-  Bokeh.set_log_level("info");
-</script>
-
-{{ the_script |safe }}
-
-
-<style>
-  /* Need this to get the page in "desktop mode"; not having an infinite height.*/
-  html, body {height: 100%; margin:5px;}
-</style>
-
-<div id="navigation" class="grid_12 alpha">
-  {% if user.is_authenticated and mayedit %}
-  <div class="grid_2 alpha">
-    <p>
-      <a class="button gray small" href="/rowers/workout/{{ id }}/edit">Edit Workout</a>
-    </p>
-  </div>
-  <div class="grid_2 suffix_8 omega">
-    <p>
-      <a class="button gray small" href="/rowers/workout/{{ id }}/advanced">Advanced Edit</a>
-    </p>
-
-  </div>
-  {% endif %}
-</div>
-
-
-<p>&nbsp;</p>
-
-<div id="plotbuttons" class="grid_12 alpha">
-  
-
-  <div id="x-axis" class="grid_6 alpha">
-    <div class="grid_2 alpha dropdown">
-      <button class="grid_2 alpha button blue small dropbtn">X-axis</button>
-      <div class="dropdown-content">
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/time/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Time</a>
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/distance/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Distance</a>
-	{% if promember %}
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/power/{{ yparam1 }}/{{ yparam2 }}/scatter">Power</a>
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/hr/{{ yparam1 }}/{{ yparam2 }}/scatter">HR</a>
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/spm/{{ yparam1 }}/{{ yparam2 }}/scatter">SPM</a>
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/peakforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Peak Force</a>
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/averageforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Average Force</a>
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/forceratio/{{ yparam1 }}/{{ yparam2 }}/scatter">Average/Peak force ratio</a>
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/drivelength/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Length</a>
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/driveenergy/{{ yparam1 }}/{{ yparam2 }}/scatter">Work per Stroke</a>
-	<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/drivespeed/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Speed</a>
-	{% else %}
-	<a class="button rosy small" href="/rowers/promembership">Power (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">HR (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">SPM (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Peak Force (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Average Force (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Average/Peak Force Ratio (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Drive Length (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Work per Stroke (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Drive Speed (Pro)</a>
-        
-	{% endif %}
-      </div>
-    </div>
-    
-    <div class="grid_2 dropdown">
-      <button class="grid_2 alpha button blue small dropbtn">Left</button>
-      <div class="dropdown-content">
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/pace/{{ yparam2 }}/{{ plottype }}">Pace</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/hr/{{ yparam2 }}/{{ plottype }}">HR</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/spm/{{ yparam2 }}/{{ plottype }}">SPM</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/power/{{ yparam2 }}/{{ plottype }}">Power</a>
-	{% if promember %}
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/peakforce/{{ yparam2 }}/{{ plottype }}">Peak Force</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/averageforce/{{ yparam2 }}/{{ plottype }}">Average Force</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/forceratio/{{ yparam2 }}/{{ plottype }}">Average/Peak Force Ratio</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/drivelength/{{ yparam2 }}/{{ plottype }}">Drive Length</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/driveenergy/{{ yparam2 }}/{{ plottype }}">Work per Stroke</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/drivespeed/{{ yparam2 }}/{{ plottype }}">Drive Speed</a>
-        <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/rhythm/{{ yparam2 }}/{{ plottype }}">Stroke Rhythm</a>
-	{% else %}
-	<a class="button rosy small" href="/rowers/promembership">Peak Force (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Average Force (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Average/Peak Force Ratio (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Drive Length (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Work per Stroke (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Drive Speed (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Stroke Rhytm (Pro)</a>
-	{% endif %}
-        
-      </div>
-    </div>
-    
-    <div class="grid_2 dropdown omega">
-      <button class="grid_2 alpha button blue small dropbtn">Right</button>
-      <div class="dropdown-content">
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/hr/{{ plottype }}">HR</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/spm/{{ plottype }}">SPM</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/power/{{ plottype }}">Power</a>
-	{% if promember %}
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/peakforce/{{ plottype }}">Peak Force</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/averageforce/{{ plottype }}">Average Force</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/forceratio/{{ plottype }}">Average/Peak Force Ratio</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/drivelength/{{ plottype }}">Drive Length</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/driveenergy/{{ plottype }}">Work per Stroke</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/drivespeed/{{ plottype }}">Drive Speed</a>
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/rhythm/{{ plottype }}">Drive Rhythm</a>
-	{% else %}
-	<a class="button rosy small" href="/rowers/promembership">Peak Force (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Average Force (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Average/Peak Force Ratio (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Drive Length (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Work per Stroke (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Drive Speed (Pro)</a>
-	<a class="button rosy small" href="/rowers/promembership">Drive Rhythm (Pro)</a>
-	{% endif %}
-        
-	<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/None/{{ plottype }}">None</a>
-        
-      </div>
-    </div>
-    
-  </div>
-  
-  <div id="y-axis" class="grid_6 omega">
-    <div class="grid_2 alpha tooltip">
-      <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
-        {% csrf_token %}
-	{% if workstrokesonly %}
-	<input type="hidden" name="workstrokesonly" value="True">
-	<input class="grid_2 alpha button blue small" value="Remove Rest Strokes" type="Submit">
-	{% else %}
-	<input class="grid_2 alpha button blue small" type="hidden" name="workstrokesonly" value="False">
-	<input class="grid_2 alpha button blue small" value="Include Rest Strokes" type="Submit">
-	{% endif %}
-      </form>
-      <span class="tooltiptext">If your data source allows, this will show or hide strokes taken during rest intervals.</span>
-    </div>
-    <div class="grid_2">
-      <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/line">Line Plot</a>
-    </div>
-    <div class="grid_2 omega">
-      <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/scatter">Scatter Plot</a>
-    </div>
-  </div>
-  
-</div>
-
-<div id="theplot" class="grid_12 alpha">
-  
-  
-  {{ the_div|safe }}
-  
-</div>
-
-<div id="favorites" class="grid_12 alpha">
-  <div class="grid_2 suffix_4 alpha">
-    {% if maxfav >= 0 %}
-    <a class="button gray small" href="/rowers/me/favoritecharts">Manage Favorites</a>
-    {% else %}
-    &nbsp;
-    {% endif %}
-  </div>
-  <div class="grid_1">
-    {% if favoritenr > 0 %}
-    <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:-1 }}">&lt</a>
-    {% else %}
-    <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ maxfav }}">&lt</a>
-    {% endif %}
-  </div>
-  <div class="grid_2">
-    <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
-      {% csrf_token %}
-      <input class="grid_2 alpha button blue small" type="hidden" name="savefavorite" value="True">
-      {% if workstrokesonly %}
-      <input type="hidden" name="workstrokesonlysave" value="False">
-      {% else %}
-      <input type="hidden" name="workstrokesonlysave" value="True">
-      {% endif %}
-      <input class="grid_2 alpha button blue small" value="Make Favorite" type="Submit">
-    </form>
-  </div>
-  <div class="grid_1">
-  {% if favoritenr < maxfav %}
-  <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:1 }}">&gt</a>
-    {% else %}
-  <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart=0">&gt</a>
-    {% endif %}
-  </div>                        
-</div>
-
-{% endblock %}
-{% endlocaltime %}