Map Widget modified into OOP style
Map Widget modified into OOP style