more layout stuff
more stuff fixes