Push of Family UI beginnings in case I don't come back
Fix some nullable changes
Merge branch 'master' of https://github.com/Nedlinin/SuperKidsDay