Changed layout, and navbar a little