Top navigation menu re-organisation.
Completes https://squish.ish.com.au/tasks/view/17888