A few changes to the layout

A few changes to the layout so everything displays nicer