working upto the map displaying the items
Merge branch 'UI-work'