Improved the template page