Added navigationpage and genrepage