As I usually say YUCK WHAT A MESS.
i AGREE WITH THE OTHER REPLY. Start the whole thing over. I may be only a third year apprentice but the best and safest way to do this is to start over. Its the bosses licence that owns the place when you finish. No way did a electrician do this. Good luck and please charge accoringly.