Add order menu and clean code