Fixed sorting bug

Sorting was not taking new Total Time column into account.
I also rearranged columns to have Total Time before Average, as I though
it made more sense.