Revert 91f4cc9..6a67a5d

This rolls back to commit 91f4cc9c49393559405a9b751aa2eecdaf58068e.
Fixed axis changing

[Done]
 - Now the sorting works correctly
[Todo]
 - Color change are not reflected