Changed name of CSS id from navigation-tree to navigation-display, because it is not always a tree now. Can be simple navpills list.
Changed name back to navigation-tree and added a companion navigation-list, and now have conditional on the CSS id to set one or other.