Markers, Popups

Improved markers and popups management