Master shut off switch charging problem

IMO the charge wire needs to go to a hd relay or continuous duty solenoid then to the battery. The relay or solenoid will be made when the kill switch is on, no power to the alternator when the switch is off. The wire to the ammeter needs to be moved to a source that is also killed when the kill switch is off.