updated routes and templates