UI and CSS improvements