fixes #6898: typo in modal test
fix up customizer js and classes; turn buttons into real buttons
rejigger the customizer layout