Fixed the html markup of the header and navigation components