fix style and add map