Fixes #5906
Structure of the all subsection of the settings section has the same high level structure Fixes #5650
Closes: #4933