changed a bunch of layout stuff