Looks like good progress.

As Jazz mentioned you now need to consider trunking and cable runs, at the moment any vertical runs are awkward.

I'd also consider putting the contactor in the high voltage section.