3d commit - minor changes. Layout organization