Delivery page button action + needed changes