Simplify data passing to button clicks