redesign. Added markers and labels support