Refactor page generation
Shorten navigation names