OptionsState and MenuState

Done some work on both options and menu state.