cancel btn fixes