Slightly improve navigator window