Changed Button Listeners to CompositeListener