Improved some small layout stuff