Updated HTML and Styling on template