Lots of fixes for accordion