Finish layout and routes II