Finish layout and routes - corrected