1.7-beta1 and some layout stuff