Merge pull request #780 from corinnecurcie/stable

map fix for red dots
widget rolled back