fixing the last of the button issues