Updated the cart/order displays to accommodate the new shipping types. Admin views are backwards compatible with the old shipping styles.