SectionDrawer improvements