Use new static core layout

Requires fewer local overrides. 

Simpler to get up and running with core layout/components, which should now be the main prototyping is done in this app.