Tweaked some of the layout stuff