Fixed button bugs