updated templates and css