no inline css
Merge branch 'maps' into maps-backend