Accordion and bug fixes