Finish layout and routes @5 section