Bug fixed
Added cancel button