Changed some layout stuff, more to come