Improvements to template page