fixed button issues