Made most delivery screens reuse the same code