Cleanup cs links, nav, and a few sneaky changes