fixed button flow issues