Finish layout and routes
merge filling-in-layout