Fix search bar issue on 1st screen
Fix merge issue and search bar
Commit to push to version-1