updated button issues