Add notes to checkboxes

Firstly allow notes to be added to checkboxes.

Secondly add a mechanism for adding options to notes maintaining backwards compatibility