Some changes at contract_view and order_view