More modifications to the template and data output