Finish layout and routes plus