Narrowed the width of container
Fixed merge issue
removing prettify stuff
Adjusted nav bar