Delivery and Pickup Layout changes.