Add better confirmation message and correct event type saving when onboarding