Properly fix close + remove custom buttons