Merge branch 'dev'
Merge branch 'dev'
Map JS improvements
Fix flash message width