Updated Menu methods to make them easier to read/understand