fixing button bugs