Finish fillin in layout