Updates to css styles and website template
Resolving conflict