Corrected button handler invocations