fixed some button issues