Improving text field + other adjustments