Refactoring menu entries