Fixing some layout stuff