refactor js & css + 2 map