Add layout stuff, almost working!