Changed some vectors to lists for sorting and added a test for variable number buttons.