Looks good. One question: Is the section of the layout in front of the electrical panel moveable for whenever the panel needs to be accessed (beyond just resetting a breaker)? The NEC code calls for 3 feet of clearance in front of the panel.
Looks like you are modeling the MRL era at Livingston, correct? I am modeling the NP at Livingston in N Scale. Working on a 17 stall Roundhouse now. Take Care!