Sections improvements
Merge branch 'section-improvements'