Filling in layout

Finish branch filling-in-layout