Improve highlight mode navigation