clean templates, styling changes