added navbar, minor header fixes