cleanup and css additions