fix style, map, add currency