Added flow to modal and basic button