fixing button issues