Added new layout stuff