Some UI and css cleanup