Fixed nav_pnl speed issues