small changes to buttons and sorting