Small refactorings on button texts and names.