Styling and template updates