better OrderForm navigation