Improved navigation and support text