cleanup and css fix