Improved navigation UI