Accordion improvements