done and cancel button now working