One thing that bothers me with having weapons so broadly grouped in the design unit area, is that when I upgrade an existing troop type often the weapon types changes.

I have been playing a Krax based race, and I went to upgrade my spear men and they decided to become hammer men.  

If there will remain differentiation in weapon abilities, it would be nice to have the weapon types back into more distinctive categories.   (OR in the upgrade tab, have a second area where you could pick the weapon you want, just in case you want to equip your troops differently)

I am finding the game quite fun and appreciate most changes you have made, Thanks!