Refactored RubberDuck and Menu