rework loading of the layout, prep for graphs