Changed button label and fixed #1