Revert "Revert "Added sorting to table columns""

This reverts commit 99f774c2f962bcbd6099ba82f6189ab82550ee94.