Improve of navigability between pages in accord with specification