Resolves: fdo#74681 group related elements into vertical containers

Change-Id: Ie30890a44b5920516809f7df6cc024d9fb6accca