navi highlight fixes