Bug fixes

Cancel button doesn’t work