Finish layout and routes update