Base of auto layout text of markers
Fix stupid mistake
Improve auto layout of marker captions
Some small improvements