Improved the formatting of the template