I have checked in the following changes
- Reverted to original navigation for public -> track
- Added a couple of cargoes as part of the SampleDataGenerator to display "Claimed" and "Not Routed Cargoes"
I will be checking in a lot of files over the next 2 days, so if anything breaks kindly let me know
Thanks..Vijay