refactor delivery_option component