polishing the UI