navbar now properly collapses

Note these changes means that there are technically TWO navbars, one
hidden on sm and xs and one visible on sm and xs only.  This allows for
proper stacking