fixed navbar conflicts