couldn't get more minor than this commit

* use  in layout
* reorganize routes to be slightly more consistent throughout