Fix: Label missing
Fix: Cancel not working