More work on in-doubt delivery details screen