Re-work checkout page to simplify choices