Fixed accordion bug
Merge branch 'staging'