new search bar ui
fixing conflicts
Merge remote-tracking branch 'upstream/master'