Map added, Inventory Css adjusted
Merge conflict resolved