Use tuples for buttons and modifiers (instead of list)

Use tuples for buttons and modifiers (instead of list) #204