added delivery_mode field to order and corrected views