fixed a few button bugs