Replaced old header with the new one and included the navbar in the header