Refactor options to use menu; Add options submenus