Display shelf suggestions?

I need a good display shelf for my whisky collection. I don’t mind something similar in design to my current one (as seen in the photo) but im not against having wood on the sides as long as it has a glass front. It’s essential that there is between 38-40cm between each shelf (this is the part that makes it hard to find a good shelf).Even built in lighting would be a bonus. You can see that my current one has no more space and I want to spread them accross to another shelf so I can lessen the load on the glass shelves on the current one, and maybe keep it to 4 bottles per shelf to keep it tidy. Many thanks for any suggestions provided.