cleanup to routes and application layout
Merge pull request #1 from edwallitt/cleanup

A bit of cleanup...