Multiple fixes (Accordion/List)

Fixes Issue #803
Fixes Issue #791