Finished layout and routes (again)