Merge branch 'hotfix/schema'
Modify header animations and placement
Merge branch 'hotfix/minor-fixes' into develop