Is there any way to sort the unit roster?

[Solothurn]

No, I don't mean the encyclopedia, I know you need the CD Enhanced version for that (which I don't.) I've been going through the German long campaign starting in 1939 and I can't help but wonder, as I add extra things to my core force (couple extra tanks here, extra mortars here, another sniper, and so on) is there some way I can rearrange the order that they are in the list so that armor/infantry/artillery/misc are all grouped together, rather than the most recently added group always being last? I usually try to group things together so that deployment is straightforward and it's easy to keep track of what units you've already placed.

Another quick question - in the long campaign, if I'm sort of making my own "custom" tank company (ie starting with a Russian standard tank company, deleting the last 3-tank platoon and then adding a platoon of heavy tanks and a platoon of flamers, then cross-attaching them both to the company for an overstrength mixed sort of custom company) do those formations stay permanently attached, or do I have to manually re-attach them at the start of every battle?