fixed z-index bug on header
Merge branch 'feature'