tentative finalish version of layout
merging layout