refactoring menu
rebuild