Some navigation + sorting improvements