For cards I use a deck box then this while playing
It fits the unit card in the orientation we'd view it during play and the upgrade cards in the correct orientation as well.
It's been a great time saver and organization tool for me
Here is what they look like on Amazon
https://www.amazon.com/dp/B01CS104FE?psc=1&ref=ppx_yo2_dt_b_product_details