More improvements for the nav page