Fixed some layout stuff..