More updates to the template