Visualization improved (legend + groups)