Correcting button issues