I have a solution for the tipped over bottle. I have a small plastic tray that I keep my glues in. I cut out a piece of foam to fit in the tray. The foam has cut outs that hold the individual glue bottles and keeps them from tipping over.

Kent