Collapsable sections for Main tab
Merge conflicts