polishing the UI a bit