Refactoring to clean up menu handler a bit

All menu related functionality is in a menuHandler object