CTA: WP-840 fallback fixes.
Clubs: update listing theming.