CLUB-125 some fixes for submit page