Updated some layout stuff