template and css improvements