Cleanup and css