some navigation changes so it is more flexable and visible. Implemented scroll-spy in the navigation too.