added styles for the templates
styles for templates
replaced divs and made more styles
merge errors fixed
merge conflicts