diff --git a/rowers/forms.py b/rowers/forms.py
index d0608bb1..7387d8fe 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -1186,19 +1186,23 @@ class FlexOptionsForm(forms.Form):
     
         
 class FlexAxesForm(forms.Form):
-    axchoices = (
+    axchoices = list(
         (ax[0],ax[1]) for ax in axes if ax[0] not in ['cumdist','None']
         )
+    axchoices = dict((x,y) for x,y in axchoices)
+    axchoices = list(sorted(axchoices.items(), key = lambda x:x[1]))
     
 
-    yaxchoices = (
-        (ax[0], ax[1]) for ax in axes if ax[0] not in ['cumdist','distance','time']
-        )
+    yaxchoices = list((ax[0],ax[1]) for ax in axes if ax[0] not in ['cumdist','distance','time'])
+    yaxchoices = dict((x,y) for x,y in yaxchoices)
+    yaxchoices = list(sorted(yaxchoices.items(), key = lambda x:x[1]))
 
-    yaxchoices2 = (
-        (ax[0], ax[1]) for ax in axes if ax[0] not in ['cumdist','distance','time']
-        )
 
+    yaxchoices2 = list(
+        (ax[0],ax[1]) for ax in axes if ax[0] not in ['cumdist','distance','time']
+        )
+    yaxchoices2 = dict((x,y) for x,y in yaxchoices2)
+    yaxchoices2 = list(sorted(yaxchoices2.items(), key = lambda x:x[1]))
 
     xaxis = forms.ChoiceField(
         choices=axchoices,label='X-Axis',required=True)