Added changes to the template and the styles