Improve statistics navigation