Added labels and newer markers. Problem: Labels static on drag
Some cleanup
Agggg
Right behaviour with labels