Modified and added a bunch of layout stuff