Complete Header Refactoring to dynamic Navigation