Revert "Trying to fix the sorting button problems"

This reverts commit 041bf3f97f37947243cc5c4afad4f9bc001ad3db.