Various styling and template updates