UI cleaned up & routing matched to proper names.