fixing a bunch of layout stuff