Quick patch for new page navigation