Added templates and css
merges conflict resolution