UI work for Deliveries and Delivery views