Fixed some button issues