fixed sort ugliness
added support for ever button