Onboarding messages APPS-137 + minor labels fixes