Fixed switching views
Merge branch 'master' of https://github.com/Nedlinin/SuperKidsDay