Updated to include changes when clicking Done on keyboard