Added exit button to search view
Merge remote-tracking branch 'origin/master'