Refactored text inputs