Better menu and refactoring