Did a bit more today.

Click image for larger version. 

Name:	Control_layout_v5 002.jpg 
Views:	453 
Size:	267.4 KB 
ID:	15259
Top left space is for 12V SMPS and VFD


I decided to use the DIN rail as the star earth point (instead of a small block I had in the corner of the cabinet) and am now using proper DIN earth terminals to connect up all the earths.
Click image for larger version. 

Name:	Control_layout_v5 006.jpg 
Views:	399 
Size:	183.7 KB 
ID:	15263

I've also added a lower DIN rail which is for DC, leaving the upper for mostly AC. I've also split out the main PSU positive into 3 feeds which will run down to the fuses on the new lower DIN rail and then into the drivers.
The old DC terminal blocks for 12V, 0V, and 12V 'switched' are gone and have been replaced by DIN rail terminal blocks (blue). I looked at all sorts of options here and went with these in the end. This type are actually meant for AC neutral so will be labelled clearly as 12V DC, 0V DC, and 12V switched.
The master relay and spindle inhibit relay are now on the DC DIN rail next to them.
Click image for larger version. 

Name:	Control_layout_v5 007.jpg 
Views:	401 
Size:	210.8 KB 
ID:	15260

The drivers have been moved down a bit and the trunking run around them. The BOB has plenty of space in case it starts mis-behaving and needs to be replaced.
Click image for larger version. 

Name:	Control_layout_v5 008.jpg 
Views:	410 
Size:	195.5 KB 
ID:	15261

The power supply has been wired up correctly (!) - still need to split out the black 0V cable into 3 feeds and tidy up the general wiring but otherwise PSU is nearly done. As reported previously it all works.
Click image for larger version. 

Name:	Control_layout_v5 010.jpg 
Views:	409 
Size:	296.4 KB 
ID:	15262

More terminal blocks are on order! All for now . . .