Sort buttons working on all pages, #81 fix