Revert "Sorting and refresh working together."

This reverts commit 1b6b04af4f4a8f86cd280ef9ff53a765c4f1d7df.
Revert "Start of sorting. Breaks refresh"

This reverts commit 58476e154b0df07ade1a2b3130cd042da0dd1935.