Add back active class to navbar links. Putting the navbar below the header section had broken it.
Add functions to insert invisible spacer div on navbar affix and un-affix. This fixes scrollTop scrolling too far but breaks the buttons in the header.  Will fix that next.