Finish layout and routes 2.0