Added display map feature
Merge