Refactoring the menu + minor changes