Map improvment

- markers generation as loop
- new markers