template and css simplifications