Control Group Visuals

This is only a minor issue but I really hope they add an option to have the control group numbers on units to only appear on selection and not have it on at all times, I find its a massive eye sore and when there is a large number of units it looks like an absolute mess when armies are moving around. Thoughts?