Finish layout and routes - updated