Add further layout stuff