Minor overhaul

Rearranged to match presentation and added some missing links.