fixed weird button issues