Oh - the shipping page markup / and styles are better in my opinion.  Shipping address page - with or without addresses.  We need to add more {% block %}s in the checkout area - so we don't need to duplicate templates so much.