More styling and template changes