Misc UI fixes

Checkbox and radio will need further work, coming in separate PRs.