I received the extra pieces I ordered. So this is the final form for a while.

I got three of these single rifle shelves. I may move this up the wall for a quicker grab since this is my go to house gun.

The single shelf is adjustable so you move the heels to let the butt sit perfectly in the cradle.

Close up of the six gun shelf.

The single display pistol posts come in left and right. Since I had a lot of extra space on the right side I got a few display posts for that side.

Left hand displays

Simon is not impressed.
Other than add a few rifles, this is pretty much it. Down the road, I may add two large plates on the left side. We left room for that so it will be easy to add it.