convert the pcb to single sided
double layer pcb's are horrible from servicing point of view,
i have not been able to remove a SMPS transformer from a double sided board as yet
I think if you can separate between High voltage and low voltage for noise and other and shielding , thats very good to design multi-layer board as atripathi said.