Merging menu tabs

As a common, casual player of this game i have found menu very unorganized.

What do we have:
Soldiers tab - basically squad’s with soldiers management
Upgrades tab - squad’s 2 tab with squad leveling
Academy tab - soldiers management done much better than Soldiers tab. I literally love this one - you can sort soldiers by class, you can clearly see stars, main weapons etc.

What should be done to have it nice, tidy and more intuitive:
Rename Soldiers tab to Squads and merge it with Upgrades.
Academy - rename it as Soldiers - give us tools to sort by class, squads, stars, to send them from there to training, to organize their weapons. To swap them through different squads.

Most of the time in menu we are swaping soldiers, we taking weapons from leveled ones and sending them to reserve, putting those weapons to fresh guys, then jumping to academy to make sure we have all 3 ready to training.

Feel free to comment and add something.