Updated templates and CSS