[D#640] more updates to checkout shipping to match updated mock-up