Update section structure for the session component
Merge pull request #1001