Should be all fixed now. The bug was that options that were clicked were removed if they were a menu item too.
Note saving fix.