Refactoring menu structure