Revert "Minor update"

This reverts commit 66ac8bc1523bbf307dca2f60247249e6cb98ea56.
Revert "Refactor column sort and cleanup"

This reverts commit 4b8e8485056f0c8db02e70b5d90c9d471d3c48f5.
Revert "Refactor and sortable columns"

This reverts commit dab108149785a3099ba5e68201175a6783a67780.