Reworking layout, first draft of container logic