Merge Layout and Schema tabs in Collect Designer (work in progress)