Main navigation + header refactoring first step