Revert "Revert "fix search textfield""

This reverts commit b308cdcea512d28a1d741c7b71583e1b1d392381.
Revert "Revert "fix number picker blue line and highlight""

This reverts commit 8b299df694398c02ec39939e76f6c9d4638de28c.