changed margin sizing of navbar and width of content
merged