Modified view to show locations as table
Untested error correction and location group
Initial trip separation code