Header alignment fixes
Navigation overlay fix
Merge branch 'develop'