lots of stuff
route and view cleanup