Dividers and some span changes