More styling and template updates