Disorganized Shop Filter List

Can something ever be done with this? With the current list, I always have a problem finding the filter i need.

This is what I feel would work better, and can be noticed easier at a quick glance.

Health Health Regen Armor Magic Resist

Attack Damage Attack Speed Critical Life Steal

Ability Power Cooldown Reduction Mana Mana Regen