Checkbox alignment and minor code cleanup.