more changes to the route and templates