Multiple fixes (accordion/list)

Fixes Issue #803
Fixes Issue #791