Done button action + UI changes