did some more layout stuff