Fix Nav Bar See #926