Adding order improvements, order-item relation refactored