Merge Layout and Schema tabs (work in progress)