fixed button issues

fixed button issues