menu and search
Merge remote-tracking branch 'origin/ui'
Added Map Icons