button bugs fixed