New and reordered navigation bar items

Links and active modules still need finishing
New and restructured menu sidebars

Mostly cosmetic changes. Links, modules etc. still need doing properly.