Fix button flaw with label misplaced
Fix broken button handlers