Adding templates, tweaking styles