lots of overall refactoring to routes, actions and template logic. Good stuff