diff --git a/rowers/mytypes.py b/rowers/mytypes.py
index d3ae878e..93dae725 100644
--- a/rowers/mytypes.py
+++ b/rowers/mytypes.py
@@ -3,6 +3,7 @@ from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 from six import iteritems
+import collections
 
 workouttypes = (
     ('water','Standard Racing Shell'),
@@ -33,7 +34,7 @@ workouttypes = (
     ('other','Other'),
 )
 
-stravamapping = {
+stravamapping = collections.OrderedDict({
     'water':'Rowing',
     'rower':'Rowing',
     'skierg':'NordicSki',
@@ -61,9 +62,9 @@ stravamapping = {
     'Workout':'Workout',
     'other':'Workout',
 
-    }
+    })
 
-stmapping = {
+stmapping = collections.OrderedDict({
     'water':'Rowing',
     'rower':'Rowing',
     'skierg':'Skiing:Nordic',
@@ -92,9 +93,9 @@ stmapping = {
     'Workout':'Other:Workout',
     'other':'Other',
 
-    }
+    })
 
-rkmapping = {
+rkmapping = collections.OrderedDict({
     'water':'Rowing',
     'rower':'Rowing',
     'skierg':'Cross-Country Skiing',
@@ -122,9 +123,9 @@ rkmapping = {
     'Workout':'Other',
     'other':'Other',
 
-    }
+    })
 
-polarmapping = {
+polarmapping = collections.OrderedDict({
     'water':'Rowing',
     'rower':'Rowing',
     'skierg':'Skiing',
@@ -152,9 +153,9 @@ polarmapping = {
     'Workout':'Other Indoor',
     'other':'Other Indoor',
 
-    }
+    })
 
-tpmapping = {
+tpmapping = collections.OrderedDict({
     'water':'rowing',
     'rower':'rowing',
     'skierg':'xc-ski',
@@ -182,9 +183,9 @@ tpmapping = {
     'Workout':'other',
     'other':'other',
 
-    }
+    })
 
-c2mapping = {
+c2mapping = collections.OrderedDict({
     'water':'water',
     'rower':'rower',
     'skierg':'skierg',
@@ -212,17 +213,17 @@ c2mapping = {
     'Workout':None,
     'other':None,
 
-    }
+    })
 
-c2mappinginv = {value:key for key,value in iteritems(c2mapping) if value is not None}
+c2mappinginv = {value:key for key,value in reversed(c2mapping.items()) if value is not None}
 
-stravamappinginv = {value:key for key,value in iteritems(stravamapping) if value is not None}
+stravamappinginv = {value:key for key,value in reversed(stravamapping.items()) if value is not None}
 
-stmappinginv = {value:key for key,value in iteritems(stmapping) if value is not None}
+stmappinginv = {value:key for key,value in reversed(stmapping.items()) if value is not None}
 
-rkmappinginv = {value:key for key,value in iteritems(rkmapping) if value is not None}
+rkmappinginv = {value:key for key,value in reversed(rkmapping.items()) if value is not None}
 
-polarmappinginv = {value:key for key,value in iteritems(polarmapping) if value is not None}
+polarmappinginv = {value:key for key,value in reversed(polarmapping.items()) if value is not None}
 
 otwtypes = (
     'water',
diff --git a/rowers/templates/workoutstats.html b/rowers/templates/workoutstats.html
index dbfed1f4..a7eaf737 100644
--- a/rowers/templates/workoutstats.html
+++ b/rowers/templates/workoutstats.html
@@ -57,19 +57,16 @@
   </li>
   {% endif %}
   <li>
-    <div class="grid_2 omega suffix_4 tooltip">
       <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
         {% csrf_token %}
       {% if workstrokesonly == True %}
-        <input class="button blue small" type="hidden" name="workstrokesonly" value="False">
-        <input class="button blue small" value="Include Rest Strokes" type="Submit">
+        <input class="button" type="hidden" name="workstrokesonly" value="False">
+        <input class="button" value="Include Rest Strokes" type="Submit">
         {% else %}
-        <input class="button blue small" type="hidden" name="workstrokesonly" value="True">
-        <input class="button blue small" value="Remove Rest Strokes" type="Submit">
+        <input class="button" type="hidden" name="workstrokesonly" value="True">
+        <input class="button" value="Remove 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>
   </li>
 
   
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index e1c71d93..0867ac4b 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ