AdrianC: Active link navigation; Formatting stuff; Moving things around