diff --git a/rowers/models.py b/rowers/models.py
index 2a8b8fcc..eb6bad4d 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -842,9 +842,10 @@ class GeoCourse(models.Model):
         name = self.name
         country = self.country
         
-        return u'{country} - {name}'.format(
+        return u'{country} - {name} - {d}m'.format(
             name=name,
-            country=country
+            country=country,
+            d = course_length(self)
         )
 
 class GeoCourseEditForm(ModelForm):
@@ -861,6 +862,16 @@ class GeoPolygon(models.Model):
     course = models.ForeignKey(GeoCourse, blank=True)
     order_in_course = models.IntegerField(default=0)
 
+    def __unicode__(self):
+        name = self.name
+        coursename = self.course.name
+        
+        return u'{coursename} - {name}'.format(
+            name=name,
+            course=coursename
+        )
+    
+    
 # Need error checking to insert new polygons into existing course (all later polygons
 # increase there order_in_course number