Main: Changes to template