new 30/70 layout
Merge branch 'new-layout'