Accordion stuff.
Cleanup accordion.
Merge branch 'develop'