navigation performance tweaks