more layout stuff fixed