Updated template html and CSS