Add annotations

Also how to do radio buttons (option-groups) in UI