Finishing up filling in layout