cleaning up button assignments