Finished refactoring the Menu API