Layout Work Session 18

Pulled from CE