Richie
The only suggestion I can make is regarding the two short sidings on the far right. Instead of using the two left hand switches, try using two right hand switches in the form of a "ladder". You may be able to make those two sidings a bit longer.