Fix section/subnav activation logic
WIP
Better state management between sections
Merge branch 'master' into gh-pages
Build