update to router, and templates