fix some button bugs