fixed button interactions
resolved the conflict