fix conflict with main navbar replacing it with our new navbar and updated partial for it