Added Navbar
solve merge conflicts
Took show page out of container to make grid system work out
Fixed some grid and gutter stuff