Clean up and css update