Finish layout and routes 2