Additional panes in the Star menu

The different panes on the Star menu have been getting cluttered for some time (or maybe that is just a symptom of my advancement through the levels - currently lvl 39), but the new marshals have tipped it over the edge. I (and I suspect most people) use my explorers and geologists much more than I do generals or marshals, so to have them scrolled off the bottom of the screen is a bit of a pain.

Could we not have two rows of tabs at the bottom instead of one, and then have something like the following panes:

All | Buffs | Resources | Explorers | Geologists
Generals | Marshals | Adventures | Buildings | Misc

This keeps gem-purchased building licenses separate from the purely decorative flowers, lamp-posts etc., and away from my hoard of adventures. With this arrangement, it should be much easier to find what you need and hence improve playability.