Minor corrections to layout and routes