CLUB-125 partials for submit page and related fixes