Fix a couple annoyances with checkboxes on options menu.
Cleanup and formatting to match conventions better.