fixed button bugs