Changed logic of the delivery details to pages