Fixed #52: Reorganize tabs (and data structure) on the track/trek pages