Accordions added to online
Merge conflict fixed