Fixed navbar as per #9619