Finished layouts and routes, corrected2