Fix missing reference
Add some filters for formatting time/distance
Attempt to make the route list a bit more readable
Tidy up some modules and names
Merge
Fix syntax error after merge