Many improvements to locality page and more