More restructured menu sidebars

Links, modules etc. still need doing properly.