Better markup for checkout form