Improve rail routes
Finish layout and routes