Added notifications for skipping onboarding
Restructured code