Onboarding changes
Layout adjustments from APPS-225
Misc fixes from APPS-225