routing and templates changes