Add better navigation controls