Fix order of navigation bar items; organize between header and footer modules