I upgrade my inventory every time I shop to make sure I’m on track and not concentrating in only one area.
Water is always the hardest thing to store so I use a lot of those 2 liter soda bottles the kids use. You can use a tube, boil the water in one pot and collect the steam in another as it recondenses to help purify it. The 2 liters are easier to store in small places and not as flimsy as many of the newer water bottles.
My bed sits on top of the 5 gallon food buckets to save space, I put a board over them to keep the mattress from being lumpy. I keep the first aid stuff in 5 gallon buckets too to keep them from getting wet, and color code the buckets so if we have to leave we know which buckets to grab. Food in one color, first aid another and clothes in another that kind of thing that way we don’t have to stop to read what is in the buckets to make sure we have the variety we need. This works well if you have children helping who are still learning to read.