Fix button issues