Fix minor button bugs