Temp/partial fix
Merge branch 'header-height-bug-fix' into develop