refactored
Merge remote-tracking branch 'origin/master'
added navigation bar in the search field