Added JP icons, map, tooltip refactoring