New page navigation inplace, and bug fixes