okay actually fixed navbar
fix merge conflicts