Refactor Text Buttons