Minor corrections to new layout.