Styles improvements
Map improvements