Re-add missing default and button fix