Ui "Done"

can be enhanced.