Big layout changes

Carousel and Navbar taken out