Fixed map text color
Map enhancements