Reviewed the way page navigation works