UI and style cleanup