Current Bottles should be renamed/repurposed to be only for potions and be potion bottles and bigger bottles should be added for storing and transporting beer, wine, and other or larger portions of liquid.
Alternatively current bottles could be small bottles and you could add large bottles. Both could hold beer, wine, potions, or other liquids but large bottles could hold multiple portions.
Additionally shelves should be able to hold both kinds of bottles and you should be able to see the bottles on them like books.