Fixed button issues