polishing the UI ;)