Solved button issues