Looks great! Where did you get the container? Another solution to the pump issue may be a silicone mat.
Thanks. It's from a local (UK) supplier that supply various water containers. The silicone mat is a nice idea that I've seen used a lot, but was always an issue for me before as I used to use 25 litre jerry cans and the pump was pretty much the same size as the water outlet! This container has a much larger opening, so I may yet use a mat if my current solution doesn't hold up.