Add ctrls to clear options and mode.

Change RI ctrl so it doesn't clash.
3 files changed