Trying to fix page navigation again...