minor adjustments to layout and span