more fixes to page navigation