WIP add Layout  to Stage
Merge remote-tracking branch 'origin/master'