first draft of layout changes