Add "optional" checkboxes, label CSS cleanup, code clean-up.

Signed-off-by: suicidepills <atom.mac@gmail.com>