Merge branch 'new-layout' into cobleebuilder