The original schematic is certainly NOT safe if connected to the incoming AC supply. It can be made safer by using a 1:1 isolating transformer and earthing the top line of the circuit but there could still be dangerous voltages on the switch contacts.
Unfortunately, this kind of circuit does not lend itself to having more switches and lamps.