Refactor menu bar code into separate class; Fix minor Simulation Options typo