Last round of changes (fixing button label)