fixes to done button click