Updated template and styling