Don't show payment form right away, formatting tweaks