navbar switch fixup