Make scrolling and navigation more robust