[FEATURE] Fixed up expandable sections