Improve the onboarding


 * Improve the local onboarding