Fixed scrollspy and layout issues with navbar.

Used fix to scrollspy from https://github.com/P2000/bootstrap/commit/7e286a7f5cd7ddee7409ba15eacfb70e33ca6c2d.