Improved User Onboarding

Improved User Onboarding