Tidy up and neaten

Other things to do:

All-encompassing navboxes, and potentially categorial navboxes, such as the one for Powers and Power-ups. (REVIEW, original method too convoluted, all encompassing bloated, find COMPROMISE between the approaches!)