layout stuff
fixed merge conflicts