Finished layout and routes 2