updated templates and styling