updated updatePage to toggle classes rather than rebuild nav
merged master with previous commit