Improve Index Navigation.