Updated for workflow & button_click

Updated for workflow & button_click