wip
basic scaffold for layout.
Merge branch 'layout' into dev