Fixing up onboarding, addressing some UI issues from beta 1