Improved Menu Abstraction

Menu abstraction now actually works!