Some changes in OrderView