Check in more refactoring of the jsps to support navigation