more layout stuff
Merge branch 'LayoutDesign'