Attempt to combine

Attempted to combine work done by everyone. Navbar still to be adjusted.
Scroll function to be implemented.