Header now includes nav bar

Navigation bar is now included in the header.