Finish layout and routes extend