refactoring and added a change in the menu for order/remove order