Fixed some layout stuff