incorporating Isis's suggestions
cleaned up more navigation confusion
updates all now live: I had to correct a whole bunch of links (again!)