Updated template and css