button issues fixed