changed templates to look nicer