Finish filling-layout