template and css fix