Extend master layout from another basic layout

Use base layout to start over as clean as possible