Layout Work Session 6

Pulled from CE