Page navigation re-implemented