Templates and router fixed