Fixed several button issues