Make metrics toggle in maps
add additional metrics for maps