Design search field
Merge branch 'master' into integration