Be sure to skip the upsell if the form fails to complete. Also add some output changes to make it easier to theme.