It all comes down to choosing the right containers and labelling them well. I used to make do with a mish mash of plastic containers but they did not fit nicely nor stacked well. So when I bought a new family of containers that stored perfectly, goodbye messy fridge! I prefer square containers since I think they save space and better fit the fridge versus round ones.
I also recommend getting transparent ones so you can see the contents inside. Finally, don’t forget to label them (remember that some food look different when frozen —- I once mistook bagoong for corned beef, oh horror!). I use a label maker but you can also write on a piece of masking tape with a marker, or directly write on the plastic container with a white board marker.