Header menu refactoring