Separated layout stuff better