tweaked admin labels and dashboard grouping