Add missing links
Tidy and re-order