Harmonize GAE nav with static nav.

Cheers,

Jeremy