Delivery page refactored