Can we get a bench and active notifier for things like tools, energy switches, attaching energy, etc

I was playing a game and I had a Virizion EX in my active spot with 2 grass energies and a muscle band, and then I had a Virizion EX on my bench with 2 grass energies and a muscle band.

As someone still new to all the “newer” changes, I had no idea which one was my active pokemon and which one was my bench pokemon when trying to add another energy. I had no other pokemon on my bench to help me figure it out too.

Here’s a screenshot of what I see when I try to attach a muscle band:

I now know the top Pokemon is always the active, but having something that states which pokemon is which would be a good addition.