Delivery and payment block refactored view