fixed all button issues