Navigation Changes

Made a large number of small changes to the site's navigation.
Navigation Changes Part 2

Missed a file.
Merge remote-tracking branch 'origin/cwDev'