fix for search bar placement
Merge branch 'develop'