Map & markers fixed