added marker control in Map class; made use of it in State class
fully incorporated markers into the new Map class