Changes from Erin (with modifications)

The tour_nav, in particular, seemed to be not actually using URLs, but
rather items ids. Fixed that, cleaned it up a bit, and reduced the
number of database hits the function would incurr.
Merged changes from last release sent by Erin.