fixed transition issues between onboarding and main
Merge branch 'master' of https://github.com/jamesoey/octo-baby