Finish layout and routes - ex 5.2