Improve navigator to avoid clipping