Fixed NavBar and header
merging