Implemented new two-level nav
Fixing merge issues
Merge pull request #21 from nphillips/master

I have mostly implemented the new 2-level nav -- need to polish further