fixes for header display in firefox
Merge branch 'master' into stable