Move option checkboxes so they are more visible against background
Correctly display option status