Finish layout and routes - final