mostly fixed navbar problem