Base: Bug fixes in page navigation