Added some layout stuff