Changes to guide nav with Edd's help, cap of 3 on related links groups thanks to Edd. Other minor tweaks
Merging master