fixing wonky navbar problems from merge