Updated all remaining top nav links to new categories. Needs testing.