Route clean up.  Moved route details to controller.  Fixed a