refactoring GET values round 1
major nav refactor, kept highlighting of page subjects
cleanup some comments