diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 664f4773872..6b9823c1175 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -27,6 +27,7 @@
 #include <QDebug>
 #include <QGroupBox>
 #include <QLabel>
+#include <QLayout>
 #include <QLineEdit>
 #include <QListWidget>
 #include <QPaintEvent>
@@ -279,14 +280,14 @@ QLabel *BaseAspect::createLabel()
     return label;
 }
 
-void BaseAspect::addLabeledItem(LayoutItem &parent, QWidget *widget)
+void BaseAspect::addLabeledItem(Layout &parent, QWidget *widget)
 {
     if (QLabel *l = createLabel()) {
         l->setBuddy(widget);
         parent.addItem(l);
-        parent.addItem(Span(std::max(d->m_spanX - 1, 1), LayoutItem(widget)));
+        parent.addItem(Span(std::max(d->m_spanX - 1, 1), widget));
     } else {
-        parent.addItem(LayoutItem(widget));
+        parent.addItem(widget);
     }
 }
 
@@ -532,21 +533,20 @@ AspectContainer *BaseAspect::container() const
     Adds the visual representation of this aspect to the layout with the
     specified \a parent using a layout builder.
 */
-void BaseAspect::addToLayout(LayoutItem &)
+void BaseAspect::addToLayout(Layout &)
 {
 }
 
-void createItem(Layouting::LayoutItem *item, const BaseAspect &aspect)
+void addToLayout(Layouting::Layout *iface, BaseAspect &aspect)
 {
-    const_cast<BaseAspect &>(aspect).addToLayout(*item);
+    aspect.addToLayout(*iface);
 }
 
-void createItem(Layouting::LayoutItem *item, const BaseAspect *aspect)
+void addToLayout(Layouting::Layout *item, BaseAspect *aspect)
 {
-    const_cast<BaseAspect *>(aspect)->addToLayout(*item);
+    aspect->addToLayout(*item);
 }
 
-
 /*!
     Updates this aspect's value from user-initiated changes in the widget.
 
@@ -858,15 +858,15 @@ public:
         aspect->bufferToGui();
     }
 
-    void addToLayoutFirst(LayoutItem &parent)
+    void addToLayoutFirst(Layout &parent)
     {
         if (m_checked && m_checkBoxPlacement == CheckBoxPlacement::Top) {
             m_checked->addToLayout(parent);
-            parent.addItem(br);
+            parent.flush();
         }
     }
 
-    void addToLayoutLast(LayoutItem &parent)
+    void addToLayoutLast(Layout &parent)
     {
         if (m_checked && m_checkBoxPlacement == CheckBoxPlacement::Right)
             m_checked->addToLayout(parent);
@@ -1140,7 +1140,7 @@ void StringAspect::setAutoApplyOnEditingFinished(bool applyOnEditingFinished)
     d->m_autoApplyOnEditingFinished = applyOnEditingFinished;
 }
 
-void StringAspect::addToLayout(LayoutItem &parent)
+void StringAspect::addToLayout(Layout &parent)
 {
     d->m_checkerImpl.addToLayoutFirst(parent);
 
@@ -1551,7 +1551,7 @@ PathChooser *FilePathAspect::pathChooser() const
     return d->m_pathChooserDisplay.data();
 }
 
-void FilePathAspect::addToLayout(Layouting::LayoutItem &parent)
+void FilePathAspect::addToLayout(Layouting::Layout &parent)
 {
     d->m_checkerImpl.addToLayoutFirst(parent);
 
@@ -1769,7 +1769,7 @@ ColorAspect::ColorAspect(AspectContainer *container)
 
 ColorAspect::~ColorAspect() = default;
 
-void ColorAspect::addToLayout(Layouting::LayoutItem &parent)
+void ColorAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(!d->m_colorButton);
     d->m_colorButton = createSubWidget<QtColorButton>();
@@ -1946,7 +1946,7 @@ BoolAspect::BoolAspect(AspectContainer *container)
 */
 BoolAspect::~BoolAspect() = default;
 
-void BoolAspect::addToLayoutHelper(Layouting::LayoutItem &parent, QAbstractButton *button)
+void BoolAspect::addToLayoutHelper(Layouting::Layout &parent, QAbstractButton *button)
 {
     switch (d->m_labelPlacement) {
     case LabelPlacement::Compact:
@@ -1955,7 +1955,7 @@ void BoolAspect::addToLayoutHelper(Layouting::LayoutItem &parent, QAbstractButto
         break;
     case LabelPlacement::AtCheckBox:
         button->setText(labelText());
-        parent.addItem(empty());
+        parent.addItem(empty);
         parent.addItem(button);
         break;
     case LabelPlacement::InExtraLabel:
@@ -1973,20 +1973,18 @@ void BoolAspect::addToLayoutHelper(Layouting::LayoutItem &parent, QAbstractButto
     });
 }
 
-LayoutItem BoolAspect::adoptButton(QAbstractButton *button)
+std::function<void(Layouting::Layout *)> BoolAspect::adoptButton(QAbstractButton *button)
 {
-    LayoutItem parent;
-
-    addToLayoutHelper(parent, button);
-
-    bufferToGui();
-    return parent;
+    return [this, button](Layouting::Layout *layout) {
+        addToLayoutHelper(*layout, button);
+        bufferToGui();
+    };
 }
 
 /*!
     \reimp
 */
-void BoolAspect::addToLayout(Layouting::LayoutItem &parent)
+void BoolAspect::addToLayout(Layouting::Layout &parent)
 {
     QCheckBox *checkBox = createSubWidget<QCheckBox>();
     addToLayoutHelper(parent, checkBox);
@@ -2092,7 +2090,7 @@ SelectionAspect::~SelectionAspect() = default;
 /*!
     \reimp
 */
-void SelectionAspect::addToLayout(Layouting::LayoutItem &parent)
+void SelectionAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(d->m_buttonGroup == nullptr);
     QTC_CHECK(!d->m_comboBox);
@@ -2266,7 +2264,7 @@ MultiSelectionAspect::~MultiSelectionAspect() = default;
 /*!
     \reimp
 */
-void MultiSelectionAspect::addToLayout(LayoutItem &builder)
+void MultiSelectionAspect::addToLayout(Layout &builder)
 {
     QTC_CHECK(d->m_listView == nullptr);
     if (d->m_allValues.isEmpty())
@@ -2375,7 +2373,7 @@ IntegerAspect::~IntegerAspect() = default;
 /*!
     \reimp
 */
-void IntegerAspect::addToLayout(Layouting::LayoutItem &parent)
+void IntegerAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(!d->m_spinBox);
     d->m_spinBox = createSubWidget<QSpinBox>();
@@ -2477,7 +2475,7 @@ DoubleAspect::~DoubleAspect() = default;
 /*!
     \reimp
 */
-void DoubleAspect::addToLayout(LayoutItem &builder)
+void DoubleAspect::addToLayout(Layout &builder)
 {
     QTC_CHECK(!d->m_spinBox);
     d->m_spinBox = createSubWidget<QDoubleSpinBox>();
@@ -2634,7 +2632,7 @@ StringListAspect::~StringListAspect() = default;
 /*!
     \reimp
 */
-void StringListAspect::addToLayout(LayoutItem &parent)
+void StringListAspect::addToLayout(Layout &parent)
 {
     Q_UNUSED(parent)
     // TODO - when needed.
@@ -2710,7 +2708,7 @@ void FilePathListAspect::bufferToGui()
     d->undoable.setWithoutUndo(m_buffer);
 }
 
-void FilePathListAspect::addToLayout(LayoutItem &parent)
+void FilePathListAspect::addToLayout(Layout &parent)
 {
     d->undoable.setSilently(value());
 
@@ -2804,7 +2802,7 @@ IntegersAspect::~IntegersAspect() = default;
 /*!
     \reimp
 */
-void IntegersAspect::addToLayout(Layouting::LayoutItem &parent)
+void IntegersAspect::addToLayout(Layouting::Layout &parent)
 {
     Q_UNUSED(parent)
     // TODO - when needed.
@@ -2841,7 +2839,7 @@ TextDisplay::~TextDisplay() = default;
 /*!
     \reimp
 */
-void TextDisplay::addToLayout(LayoutItem &parent)
+void TextDisplay::addToLayout(Layout &parent)
 {
     if (!d->m_label) {
         d->m_label = createSubWidget<InfoLabel>(d->m_message, d->m_type);
@@ -2893,7 +2891,7 @@ public:
     QList<BaseAspect *> m_items; // Both owned and non-owned.
     QList<BaseAspect *> m_ownedItems; // Owned only.
     QStringList m_settingsGroup;
-    std::function<Layouting::LayoutItem ()> m_layouter;
+    std::function<Layouting::Layout()> m_layouter;
 };
 
 AspectContainer::AspectContainer()
@@ -2908,6 +2906,11 @@ AspectContainer::~AspectContainer()
     qDeleteAll(d->m_ownedItems);
 }
 
+void AspectContainer::addToLayout(Layouting::Layout &parent)
+{
+    parent.addItem(layouter()());
+}
+
 /*!
     \internal
 */
@@ -2945,12 +2948,12 @@ AspectContainer::const_iterator AspectContainer::end() const
     return d->m_items.cend();
 }
 
-void AspectContainer::setLayouter(const std::function<Layouting::LayoutItem ()> &layouter)
+void AspectContainer::setLayouter(const std::function<Layouting::Layout ()> &layouter)
 {
     d->m_layouter = layouter;
 }
 
-std::function<LayoutItem ()> AspectContainer::layouter() const
+std::function<Layout ()> AspectContainer::layouter() const
 {
     return d->m_layouter;
 }
@@ -3447,7 +3450,7 @@ private:
     int m_index;
 };
 
-void AspectList::addToLayout(Layouting::LayoutItem &parent)
+void AspectList::addToLayout(Layouting::Layout &parent)
 {
     using namespace Layouting;
 
@@ -3466,7 +3469,7 @@ void AspectList::addToLayout(Layouting::LayoutItem &parent)
             addItem(d->createItem());
         });
 
-        Column column{noMargin()};
+        Column column{noMargin};
 
         forEachItem<BaseAspect>([&column, this](const std::shared_ptr<BaseAspect> &item, int idx) {
             auto removeBtn = new IconButton;
@@ -3557,7 +3560,7 @@ bool StringSelectionAspect::guiToBuffer()
     return oldBuffer != m_buffer;
 }
 
-void StringSelectionAspect::addToLayout(Layouting::LayoutItem &parent)
+void StringSelectionAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_ASSERT(m_fillCallback, return);
 
@@ -3630,4 +3633,4 @@ void StringSelectionAspect::addToLayout(Layouting::LayoutItem &parent)
     return addLabeledItem(parent, comboBox);
 }
 
-} // namespace Utils
+} // Utils
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index a5c22bb8584..13c1c22e4fc 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -29,9 +29,7 @@ class QStandardItemModel;
 class QItemSelectionModel;
 QT_END_NAMESPACE
 
-namespace Layouting {
-class LayoutItem;
-}
+namespace Layouting { class Layout; }
 
 namespace Utils {
 
@@ -64,6 +62,7 @@ class QTCREATOR_UTILS_EXPORT BaseAspect : public QObject
 
 public:
     BaseAspect(AspectContainer *container = nullptr);
+    BaseAspect(const BaseAspect &) = delete;
     ~BaseAspect() override;
 
     Id id() const;
@@ -125,9 +124,7 @@ public:
     virtual void toMap(Store &map) const;
     virtual void toActiveMap(Store &map) const { toMap(map); }
     virtual void volatileToMap(Store &map) const;
-
-    virtual void addToLayout(Layouting::LayoutItem &parent);
-
+    virtual void addToLayout(Layouting::Layout &parent);
     virtual void readSettings();
     virtual void writeSettings() const;
 
@@ -223,7 +220,7 @@ protected:
     virtual void handleGuiChanged();
 
     QLabel *createLabel();
-    void addLabeledItem(Layouting::LayoutItem &parent, QWidget *widget);
+    void addLabeledItem(Layouting::Layout &parent, QWidget *widget);
 
     void setDataCreatorHelper(const DataCreator &creator) const;
     void setDataClonerHelper(const DataCloner &cloner) const;
@@ -276,8 +273,8 @@ private:
     friend class Internal::CheckableAspectImplementation;
 };
 
-QTCREATOR_UTILS_EXPORT void createItem(Layouting::LayoutItem *item, const BaseAspect &aspect);
-QTCREATOR_UTILS_EXPORT void createItem(Layouting::LayoutItem *item, const BaseAspect *aspect);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layouting::Layout *layout, BaseAspect *aspect);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layouting::Layout *layout, BaseAspect &aspect);
 
 template<typename ValueType>
 class
@@ -439,7 +436,7 @@ public:
     BoolAspect(AspectContainer *container = nullptr);
     ~BoolAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     std::function<void(QObject *)> groupChecker();
 
     Utils::CheckableDecider askAgainCheckableDecider();
@@ -452,10 +449,10 @@ public:
                   LabelPlacement labelPlacement = LabelPlacement::InExtraLabel);
     void setLabelPlacement(LabelPlacement labelPlacement);
 
-    Layouting::LayoutItem adoptButton(QAbstractButton *button);
+    std::function<void(Layouting::Layout *)> adoptButton(QAbstractButton *button);
 
 private:
-    void addToLayoutHelper(Layouting::LayoutItem &parent, QAbstractButton *button);
+    void addToLayoutHelper(Layouting::Layout &parent, QAbstractButton *button);
 
     void bufferToGui() override;
     bool guiToBuffer() override;
@@ -504,7 +501,7 @@ public:
     ColorAspect(AspectContainer *container = nullptr);
     ~ColorAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
 private:
     void bufferToGui() override;
@@ -521,7 +518,7 @@ public:
     SelectionAspect(AspectContainer *container = nullptr);
     ~SelectionAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     void finish() override;
 
     QString stringValue() const;
@@ -569,7 +566,7 @@ public:
     MultiSelectionAspect(AspectContainer *container = nullptr);
     ~MultiSelectionAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     enum class DisplayStyle { ListView };
     void setDisplayStyle(DisplayStyle style);
@@ -596,7 +593,7 @@ public:
     StringAspect(AspectContainer *container = nullptr);
     ~StringAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     QString operator()() const { return expandedValue(); }
     QString expandedValue() const;
@@ -703,7 +700,7 @@ public:
 
     PathChooser *pathChooser() const; // Avoid to use.
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void fromMap(const Utils::Store &map) override;
     void toMap(Utils::Store &map) const override;
@@ -730,7 +727,7 @@ public:
     IntegerAspect(AspectContainer *container = nullptr);
     ~IntegerAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void setRange(qint64 min, qint64 max);
     void setLabel(const QString &label); // FIXME: Use setLabelText
@@ -759,7 +756,7 @@ public:
     DoubleAspect(AspectContainer *container = nullptr);
     ~DoubleAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void setRange(double min, double max);
     void setPrefix(const QString &prefix);
@@ -831,7 +828,7 @@ public:
     StringListAspect(AspectContainer *container = nullptr);
     ~StringListAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void appendValue(const QString &value, bool allowDuplicates = true);
     void removeValue(const QString &value);
@@ -855,7 +852,7 @@ public:
     bool guiToBuffer() override;
     void bufferToGui() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     void setPlaceHolderText(const QString &placeHolderText);
 
     void appendValue(const FilePath &path, bool allowDuplicates = true);
@@ -875,7 +872,7 @@ public:
     IntegersAspect(AspectContainer *container = nullptr);
     ~IntegersAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 };
 
 class QTCREATOR_UTILS_EXPORT TextDisplay : public BaseAspect
@@ -888,7 +885,7 @@ public:
                          InfoLabel::InfoType type = InfoLabel::None);
     ~TextDisplay() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void setIconType(InfoLabel::InfoType t);
     void setText(const QString &message);
@@ -939,6 +936,8 @@ public:
     AspectContainer(const AspectContainer &) = delete;
     AspectContainer &operator=(const AspectContainer &) = delete;
 
+    void addToLayout(Layouting::Layout &parent) override;
+
     void registerAspect(BaseAspect *aspect, bool takeOwnership = false);
     void registerAspects(const AspectContainer &aspects);
 
@@ -989,8 +988,8 @@ public:
     const_iterator begin() const;
     const_iterator end() const;
 
-    void setLayouter(const std::function<Layouting::LayoutItem()> &layouter);
-    std::function<Layouting::LayoutItem()> layouter() const;
+    void setLayouter(const std::function<Layouting::Layout()> &layouter);
+    std::function<Layouting::Layout()> layouter() const;
 
 signals:
     void applied();
@@ -1131,7 +1130,7 @@ public:
 
     QVariant volatileVariantValue() const override { return {}; }
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
 private:
     std::unique_ptr<Internal::AspectListPrivate> d;
@@ -1143,7 +1142,7 @@ class QTCREATOR_UTILS_EXPORT StringSelectionAspect : public Utils::TypedAspect<Q
 public:
     StringSelectionAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     using ResultCallback = std::function<void(QList<QStandardItem *> items)>;
     using FillCallback = std::function<void(ResultCallback)>;
diff --git a/src/libs/utils/layoutbuilder.cpp b/src/libs/utils/layoutbuilder.cpp
index 31c67e4d0f6..029b41c3111 100644
--- a/src/libs/utils/layoutbuilder.cpp
+++ b/src/libs/utils/layoutbuilder.cpp
@@ -3,7 +3,6 @@
 
 #include "layoutbuilder.h"
 
-#include <QApplication>
 #include <QDebug>
 #include <QFormLayout>
 #include <QGridLayout>
@@ -29,10 +28,23 @@ namespace Layouting {
 #define QTC_ASSERT(cond, action) if (Q_LIKELY(cond)) {} else { QTC_STRING(#cond); action; } do {} while (0)
 #define QTC_CHECK(cond) if (cond) {} else { QTC_STRING(#cond); } do {} while (0)
 
-class FlowLayout final : public QLayout
+template <typename X>
+typename X::Implementation *access(const X *x)
 {
-    Q_OBJECT
+    return static_cast<typename X::Implementation *>(x->ptr);
+}
 
+template <typename X>
+void apply(X *x, std::initializer_list<typename X::I> ps)
+{
+    for (auto && p : ps)
+        p.apply(x);
+}
+
+// FlowLayout
+
+class FlowLayout : public QLayout
+{
 public:
     explicit FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1, int vSpacing = -1)
         : QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
@@ -181,29 +193,49 @@ private:
     \namespace Layouting
     \inmodule QtCreator
 
-    \brief The Layouting namespace contains classes for use with layout builders.
+    \brief The Layouting namespace contains classes and functions to conveniently
+    create layouts in code.
+
+    Classes in the namespace help to create create QLayout or QWidget derived class,
+    instances should be used locally within a function and never stored.
+
+    \sa Layouting::Widget, Layouting::Layout
 */
 
 
+/*!
+    \class Layouting::Layout
+    \inmodule QtCreator
+
+    The Layout class is a base class for more specific builder
+    classes to create QLayout derived objects.
+ */
+
+/*!
+    \class Layouting::Widget
+    \inmodule QtCreator
+
+    The Widget class is a base class for more specific builder
+    classes to create QWidget derived objects.
+*/
+
 /*!
     \class Layouting::LayoutItem
     \inmodule QtCreator
 
-    \brief The LayoutItem class represents widgets, layouts, and aggregate
-    items for use in conjunction with layout builders.
-
-    Layout items are typically implicitly constructed when adding items to a
-    \c LayoutBuilder instance using \c LayoutBuilder::addItem() or
-    \c LayoutBuilder::addItems() and never stored in user code.
+    The LayoutItem class is used for intermediate results
+    while creating layouts with a concept of rows and spans, such
+    as Form and Grid.
 */
 
-/*!
-    Constructs a layout item instance representing an empty cell.
- */
 LayoutItem::LayoutItem() = default;
 
 LayoutItem::~LayoutItem() = default;
 
+LayoutItem::LayoutItem(const LayoutModifier &inner)
+{
+    ownerModifier = inner;
+}
 
 /*!
     \fn  template <class T> LayoutItem(const T &t)
@@ -217,44 +249,15 @@ LayoutItem::~LayoutItem() = default;
     \li  \c {QWidget *}
     \li  \c {QLayout *}
     \endlist
- */
+*/
 
-struct ResultItem
+// Object
+
+Object::Object(std::initializer_list<I> ps)
 {
-    ResultItem() = default;
-    explicit ResultItem(QLayout *l) : layout(l), empty(!l) {}
-    explicit ResultItem(QWidget *w) : widget(w), empty(!w) {}
-
-    QString text;
-    QLayout *layout = nullptr;
-    QWidget *widget = nullptr;
-    int space = -1;
-    int stretch = -1;
-    int span = 1;
-    bool empty = false;
-};
-
-struct Slice
-{
-    Slice() = default;
-    Slice(QLayout *l) : layout(l) {}
-    Slice(QWidget *w, bool isLayouting=false) : widget(w), isLayouting(isLayouting) {}
-
-    QLayout *layout = nullptr;
-    QWidget *widget = nullptr;
-
-    void flush();
-
-    // Grid-specific
-    int currentGridColumn = 0;
-    int currentGridRow = 0;
-    bool isFormAlignment = false;
-    bool isLayouting = false;
-    Qt::Alignment align = {}; // Can be changed to
-
-    // Grid or Form
-    QList<ResultItem> pendingItems;
-};
+    ptr = new Implementation;
+    apply(this, ps);
+}
 
 static QWidget *widgetForItem(QLayoutItem *item)
 {
@@ -262,12 +265,11 @@ static QWidget *widgetForItem(QLayoutItem *item)
         return w;
     if (item->spacerItem())
         return nullptr;
-    QLayout *l = item->layout();
-    if (!l)
-        return nullptr;
-    for (int i = 0, n = l->count(); i < n; ++i) {
-        if (QWidget *w = widgetForItem(l->itemAt(i)))
-            return w;
+    if (QLayout *l = item->layout()) {
+        for (int i = 0, n = l->count(); i < n; ++i) {
+            if (QWidget *w = widgetForItem(l->itemAt(i)))
+                return w;
+        }
     }
     return nullptr;
 }
@@ -279,7 +281,7 @@ static QLabel *createLabel(const QString &text)
     return label;
 }
 
-static void addItemToBoxLayout(QBoxLayout *layout, const ResultItem &item)
+static void addItemToBoxLayout(QBoxLayout *layout, const LayoutItem &item)
 {
     if (QWidget *w = item.widget) {
         layout->addWidget(w);
@@ -287,8 +289,6 @@ static void addItemToBoxLayout(QBoxLayout *layout, const ResultItem &item)
         layout->addLayout(l);
     } else if (item.stretch != -1) {
         layout->addStretch(item.stretch);
-    } else if (item.space != -1) {
-        layout->addSpacing(item.space);
     } else if (!item.text.isEmpty()) {
         layout->addWidget(createLabel(item.text));
     } else if (item.empty) {
@@ -298,7 +298,7 @@ static void addItemToBoxLayout(QBoxLayout *layout, const ResultItem &item)
     }
 }
 
-static void addItemToFlowLayout(FlowLayout *layout, const ResultItem &item)
+static void addItemToFlowLayout(FlowLayout *layout, const LayoutItem &item)
 {
     if (QWidget *w = item.widget) {
         layout->addWidget(w);
@@ -306,8 +306,6 @@ static void addItemToFlowLayout(FlowLayout *layout, const ResultItem &item)
         layout->addItem(l);
 //    } else if (item.stretch != -1) {
 //        layout->addStretch(item.stretch);
-//    } else if (item.space != -1) {
-//        layout->addSpacing(item.space);
     } else if (item.empty) {
         // Nothing to do, but no reason to warn, either
     } else if (!item.text.isEmpty()) {
@@ -317,163 +315,6 @@ static void addItemToFlowLayout(FlowLayout *layout, const ResultItem &item)
     }
 }
 
-void Slice::flush()
-{
-    if (pendingItems.empty())
-        return;
-
-    if (auto formLayout = qobject_cast<QFormLayout *>(layout)) {
-
-        // If there are more than two items, we cram the last ones in one hbox.
-        if (pendingItems.size() > 2) {
-            auto hbox = new QHBoxLayout;
-            hbox->setContentsMargins(0, 0, 0, 0);
-            for (int i = 1; i < pendingItems.size(); ++i)
-                addItemToBoxLayout(hbox, pendingItems.at(i));
-            while (pendingItems.size() > 1)
-                pendingItems.pop_back();
-            pendingItems.append(ResultItem(hbox));
-        }
-
-        if (pendingItems.size() == 1) { // One one item given, so this spans both columns.
-            const ResultItem &f0 = pendingItems.at(0);
-            if (auto layout = f0.layout)
-                formLayout->addRow(layout);
-            else if (auto widget = f0.widget)
-                formLayout->addRow(widget);
-        } else if (pendingItems.size() == 2) { // Normal case, both columns used.
-            ResultItem &f1 = pendingItems[1];
-            const ResultItem &f0 = pendingItems.at(0);
-            if (!f1.widget && !f1.layout && !f1.text.isEmpty())
-                f1.widget = createLabel(f1.text);
-
-            if (f0.widget) {
-                if (f1.layout)
-                    formLayout->addRow(f0.widget, f1.layout);
-                else if (f1.widget)
-                    formLayout->addRow(f0.widget, f1.widget);
-            } else  {
-                if (f1.layout)
-                    formLayout->addRow(createLabel(f0.text), f1.layout);
-                else if (f1.widget)
-                    formLayout->addRow(createLabel(f0.text), f1.widget);
-            }
-        } else {
-            QTC_CHECK(false);
-        }
-
-        // Set up label as buddy if possible.
-        const int lastRow = formLayout->rowCount() - 1;
-        QLayoutItem *l = formLayout->itemAt(lastRow, QFormLayout::LabelRole);
-        QLayoutItem *f = formLayout->itemAt(lastRow, QFormLayout::FieldRole);
-        if (l && f) {
-            if (QLabel *label = qobject_cast<QLabel *>(l->widget())) {
-                if (QWidget *widget = widgetForItem(f))
-                    label->setBuddy(widget);
-            }
-        }
-
-    } else if (auto gridLayout = qobject_cast<QGridLayout *>(layout)) {
-
-        for (const ResultItem &item : std::as_const(pendingItems)) {
-            Qt::Alignment a = currentGridColumn == 0 ? align : Qt::Alignment();
-            if (item.widget)
-                gridLayout->addWidget(item.widget, currentGridRow, currentGridColumn, 1, item.span, a);
-            else if (item.layout)
-                gridLayout->addLayout(item.layout, currentGridRow, currentGridColumn, 1, item.span, a);
-            else if (!item.text.isEmpty())
-                gridLayout->addWidget(createLabel(item.text), currentGridRow, currentGridColumn, 1, 1, a);
-            currentGridColumn += item.span;
-        }
-        ++currentGridRow;
-        currentGridColumn = 0;
-
-    } else if (auto boxLayout = qobject_cast<QBoxLayout *>(layout)) {
-
-        for (const ResultItem &item : std::as_const(pendingItems))
-            addItemToBoxLayout(boxLayout, item);
-
-    } else if (auto flowLayout = qobject_cast<FlowLayout *>(layout)) {
-
-        for (const ResultItem &item : std::as_const(pendingItems))
-            addItemToFlowLayout(flowLayout, item);
-
-    } else {
-        QTC_CHECK(false);
-    }
-
-    pendingItems.clear();
-}
-
-// LayoutBuilder
-
-class LayoutBuilder
-{
-    Q_DISABLE_COPY_MOVE(LayoutBuilder)
-
-public:
-    LayoutBuilder();
-    ~LayoutBuilder();
-
-    void addItem(const LayoutItem &item);
-    void addItems(const LayoutItems &items);
-
-    QList<Slice> stack;
-};
-
-static void addItemHelper(LayoutBuilder &builder, const LayoutItem &item)
-{
-    if (item.onAdd)
-        item.onAdd(builder);
-
-    if (item.setter) {
-        if (QWidget *widget = builder.stack.last().widget)
-            item.setter(widget);
-        else if (QLayout *layout = builder.stack.last().layout)
-            item.setter(layout);
-        else
-            QTC_CHECK(false);
-    }
-
-    for (const LayoutItem &subItem : item.subItems)
-        addItemHelper(builder, subItem);
-
-    if (item.onExit)
-        item.onExit(builder);
-}
-
-void doAddText(LayoutBuilder &builder, const QString &text)
-{
-    ResultItem fi;
-    fi.text = text;
-    builder.stack.last().pendingItems.append(fi);
-}
-
-void doAddSpace(LayoutBuilder &builder, const Space &space)
-{
-    ResultItem fi;
-    fi.space = space.space;
-    builder.stack.last().pendingItems.append(fi);
-}
-
-void doAddStretch(LayoutBuilder &builder, const Stretch &stretch)
-{
-    ResultItem fi;
-    fi.stretch = stretch.stretch;
-    builder.stack.last().pendingItems.append(fi);
-}
-
-void doAddLayout(LayoutBuilder &builder, QLayout *layout)
-{
-    builder.stack.last().pendingItems.append(ResultItem(layout));
-}
-
-void doAddWidget(LayoutBuilder &builder, QWidget *widget)
-{
-    builder.stack.last().pendingItems.append(ResultItem(widget));
-}
-
-
 /*!
     \class Layouting::Space
     \inmodule QtCreator
@@ -488,39 +329,67 @@ void doAddWidget(LayoutBuilder &builder, QWidget *widget)
     \brief The Stretch class represents some stretch in a layout.
  */
 
-/*!
-    \class Layouting::LayoutBuilder
-    \internal
-    \inmodule QtCreator
 
-    \brief The LayoutBuilder class provides a convenient way to fill \c QFormLayout
-    and \c QGridLayouts with contents.
+// Layout
 
-    Filling a layout with items happens item-by-item, row-by-row.
-
-    A LayoutBuilder instance is typically used locally within a function and never stored.
-
-    \sa addItem(), addItems()
-*/
-
-
-LayoutBuilder::LayoutBuilder() = default;
-
-/*!
-    \internal
-    Destructs a layout builder.
- */
-LayoutBuilder::~LayoutBuilder() = default;
-
-void LayoutBuilder::addItem(const LayoutItem &item)
+void Layout::span(int cols, int rows)
 {
-    addItemHelper(*this, item);
+    QTC_ASSERT(!pendingItems.empty(), return);
+    pendingItems.back().spanCols = cols;
+    pendingItems.back().spanRows = rows;
 }
 
-void LayoutBuilder::addItems(const LayoutItems &items)
+void Layout::noMargin()
 {
-    for (const LayoutItem &item : items)
-        addItemHelper(*this, item);
+    customMargin({});
+}
+
+void Layout::normalMargin()
+{
+    customMargin({9, 9, 9, 9});
+}
+
+void Layout::customMargin(const QMargins &margin)
+{
+    access(this)->setContentsMargins(margin);
+}
+
+/*!
+    Attaches the constructed layout to the provided QWidget \a w.
+
+    This operation can only be performed once per LayoutBuilder instance.
+ */
+void Layout::attachTo(QWidget *widget)
+{
+    flush();
+    widget->setLayout(access(this));
+}
+
+/*!
+    Adds the layout item \a item as sub items.
+ */
+void Layout::addItem(I item)
+{
+    item.apply(this);
+}
+
+void Layout::addLayoutItem(const LayoutItem &item)
+{
+    if (QBoxLayout *lt = asBox())
+        addItemToBoxLayout(lt, item);
+    else if (FlowLayout *lt = asFlow())
+        addItemToFlowLayout(lt, item);
+    else
+        pendingItems.push_back(item);
+}
+
+/*!
+    Adds the layout items \a items as sub items.
+ */
+void Layout::addItems(std::initializer_list<I> items)
+{
+    for (const I &item : items)
+        item.apply(this);
 }
 
 /*!
@@ -529,485 +398,527 @@ void LayoutBuilder::addItems(const LayoutItems &items)
 
     \sa addItem(), addItems()
  */
-void LayoutItem::addRow(const LayoutItems &items)
+
+void Layout::addRow(std::initializer_list<I> items)
 {
-    addItem(br);
-    addItems(items);
+    for (const I &item : items)
+        item.apply(this);
+    flush();
 }
 
-/*!
-    Adds the layout item \a item as sub items.
- */
-void LayoutItem::addItem(const LayoutItem &item)
+void Layout::setSpacing(int spacing)
 {
-    subItems.append(item);
+    access(this)->setSpacing(spacing);
 }
 
-/*!
-    Adds the layout items \a items as sub items.
- */
-void LayoutItem::addItems(const LayoutItems &items)
+void Layout::setColumnStretch(int column, int stretch)
 {
-    subItems.append(items);
-}
-
-/*!
-    Attaches the constructed layout to the provided QWidget \a w.
-
-    This operation can only be performed once per LayoutBuilder instance.
- */
-
-void LayoutItem::attachTo(QWidget *w) const
-{
-    LayoutBuilder builder;
-
-    builder.stack.append(w);
-    addItemHelper(builder, *this);
-}
-
-QWidget *LayoutItem::emerge()
-{
-    LayoutBuilder builder;
-
-    builder.stack.append(Slice());
-    addItemHelper(builder, *this);
-
-    if (builder.stack.empty())
-        return nullptr;
-
-    QTC_ASSERT(builder.stack.last().pendingItems.size() == 1, return nullptr);
-    ResultItem ri = builder.stack.last().pendingItems.takeFirst();
-
-    QTC_ASSERT(ri.layout || ri.widget, return nullptr);
-
-    if (ri.layout) {
-        auto w = new QWidget;
-        w->setLayout(ri.layout);
-        return w;
+    if (auto grid = qobject_cast<QGridLayout *>(access(this))) {
+        grid->setColumnStretch(column, stretch);
+    } else {
+        QTC_CHECK(false);
     }
-
-    return ri.widget;
 }
 
-static void layoutExit(LayoutBuilder &builder)
+void addToWidget(Widget *widget, const Layout &layout)
 {
-    builder.stack.last().flush();
-    QLayout *layout = builder.stack.last().layout;
-    builder.stack.pop_back();
-
-    if (builder.stack.last().isLayouting) {
-        builder.stack.last().pendingItems.append(ResultItem(layout));
-    } else if (QWidget *widget = builder.stack.last().widget) {
-        widget->setLayout(layout);
-    } else
-        builder.stack.last().pendingItems.append(ResultItem(layout));
+    layout.flush_();
+    access(widget)->setLayout(access(&layout));
 }
 
-template<class T>
-static void layoutingWidgetExit(LayoutBuilder &builder)
+void addToLayout(Layout *layout, const Widget &inner)
 {
-    const Slice slice = builder.stack.last();
-    T *w = qobject_cast<T *>(slice.widget);
-    for (const ResultItem &ri : slice.pendingItems) {
-        if (ri.widget) {
-            w->addWidget(ri.widget);
-        } else if (ri.layout) {
-            auto child = new QWidget;
-            child->setLayout(ri.layout);
-            w->addWidget(child);
+    LayoutItem item;
+    item.widget = access(&inner);
+    layout->addLayoutItem(item);
+}
+
+void addToLayout(Layout *layout, QWidget *inner)
+{
+    LayoutItem item;
+    item.widget = inner;
+    layout->addLayoutItem(item);
+}
+
+void addToLayout(Layout *layout, QLayout *inner)
+{
+    LayoutItem item;
+    item.layout = inner;
+    layout->addLayoutItem(item);
+}
+
+void addToLayout(Layout *layout, const Layout &inner)
+{
+    inner.flush_();
+    LayoutItem item;
+    item.layout = access(&inner);
+    layout->addLayoutItem(item);
+}
+
+void addToLayout(Layout *layout, const LayoutModifier &inner)
+{
+    inner(layout);
+}
+
+void addToLayout(Layout *layout, const QString &inner)
+{
+    LayoutItem item;
+    item.text = inner;
+    layout->addLayoutItem(item);
+}
+
+void empty(Layout *iface)
+{
+    LayoutItem item;
+    item.empty = true;
+    iface->addLayoutItem(item);
+}
+
+void hr(Layout *layout)
+{
+    layout->addLayoutItem(createHr());
+}
+
+void br(Layout *iface)
+{
+    iface->flush();
+}
+
+void st(Layout *iface)
+{
+    LayoutItem item;
+    item.stretch = 1;
+    iface->addLayoutItem(item);
+}
+
+void noMargin(Layout *iface)
+{
+    iface->noMargin();
+}
+
+void normalMargin(Layout *iface)
+{
+    iface->normalMargin();
+}
+
+QFormLayout *Layout::asForm()
+{
+    return qobject_cast<QFormLayout *>(access(this));
+}
+
+QGridLayout *Layout::asGrid()
+{
+    return qobject_cast<QGridLayout *>(access(this));
+}
+
+QBoxLayout *Layout::asBox()
+{
+    return qobject_cast<QBoxLayout *>(access(this));
+}
+
+FlowLayout *Layout::asFlow()
+{
+    return dynamic_cast<FlowLayout *>(access(this));
+}
+
+void Layout::flush()
+{
+    if (pendingItems.empty())
+        return;
+
+    if (QGridLayout *lt = asGrid()) {
+        for (const LayoutItem &item : std::as_const(pendingItems)) {
+            Qt::Alignment a;
+            if (currentGridColumn == 0 && useFormAlignment) {
+                // if (auto widget = builder.stack.at(builder.stack.size() - 2).widget) {
+                //     a = widget->style()->styleHint(QStyle::SH_FormLayoutLabelAlignment);
+            }
+            if (item.widget)
+                lt->addWidget(item.widget, currentGridRow, currentGridColumn, item.spanRows, item.spanCols, a);
+            else if (item.layout)
+                lt->addLayout(item.layout, currentGridRow, currentGridColumn, item.spanRows, item.spanCols, a);
+            else if (!item.text.isEmpty())
+                lt->addWidget(createLabel(item.text), currentGridRow, currentGridColumn, item.spanRows, item.spanCols, a);
+            currentGridColumn += item.spanCols;
+            // Intentionally not used, use 'br'/'empty' for vertical progress.
+            // currentGridRow += item.spanRows;
         }
+        ++currentGridRow;
+        currentGridColumn = 0;
+        pendingItems.clear();
+        return;
     }
-    builder.stack.pop_back();
-    builder.stack.last().pendingItems.append(ResultItem(w));
-}
 
-static void widgetExit(LayoutBuilder &builder)
-{
-    QWidget *widget = builder.stack.last().widget;
-    builder.stack.pop_back();
-    builder.stack.last().pendingItems.append(ResultItem(widget));
-}
+    if (QFormLayout *fl = asForm()) {
+        if (pendingItems.size() > 2) {
+            auto hbox = new QHBoxLayout;
+            hbox->setContentsMargins(0, 0, 0, 0);
+            for (size_t i = 1; i < pendingItems.size(); ++i)
+                addItemToBoxLayout(hbox, pendingItems.at(i));
+            while (pendingItems.size() > 1)
+                pendingItems.pop_back();
+            pendingItems.push_back(hbox);
+        }
 
-Column::Column(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(new QVBoxLayout); };
-    onExit = layoutExit;
-}
+        if (pendingItems.size() == 1) { // Only one item given, so this spans both columns.
+            const LayoutItem &f0 = pendingItems.at(0);
+            if (auto layout = f0.layout)
+                fl->addRow(layout);
+            else if (auto widget = f0.widget)
+                fl->addRow(widget);
+        } else if (pendingItems.size() == 2) { // Normal case, both columns used.
+            LayoutItem &f1 = pendingItems[1];
+            const LayoutItem &f0 = pendingItems.at(0);
+            if (!f1.widget && !f1.layout && !f1.text.isEmpty())
+                f1.widget = createLabel(f1.text);
 
-Row::Row(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(new QHBoxLayout); };
-    onExit = layoutExit;
-}
+            // QFormLayout accepts only widgets or text in the first column.
+            // FIXME: Should we be more generous?
+            if (f0.widget) {
+                if (f1.layout)
+                    fl->addRow(f0.widget, f1.layout);
+                else if (f1.widget)
+                    fl->addRow(f0.widget, f1.widget);
+            } else  {
+                if (f1.layout)
+                    fl->addRow(createLabel(f0.text), f1.layout);
+                else if (f1.widget)
+                    fl->addRow(createLabel(f0.text), f1.widget);
+            }
+        } else {
+            QTC_CHECK(false);
+        }
 
-Flow::Flow(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(new FlowLayout); };
-    onExit = layoutExit;
-}
-
-Grid::Grid(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(new QGridLayout); };
-    onExit = layoutExit;
-}
-
-static QFormLayout *newFormLayout()
-{
-    auto formLayout = new QFormLayout;
-    formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
-    return formLayout;
-}
-
-Form::Form(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(newFormLayout()); };
-    onExit = layoutExit;
-}
-
-LayoutItem br()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) {
-        builder.stack.last().flush();
-    };
-    return item;
-}
-
-LayoutItem empty()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) {
-        ResultItem ri;
-        ri.empty = true;
-        builder.stack.last().pendingItems.append(ri);
-    };
-    return item;
-}
-
-LayoutItem hr()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) { doAddWidget(builder, createHr()); };
-    return item;
-}
-
-LayoutItem st()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) { doAddStretch(builder, Stretch(1)); };
-    return item;
-}
-
-LayoutItem noMargin()
-{
-    return customMargin({});
-}
-
-LayoutItem normalMargin()
-{
-    return customMargin({9, 9, 9, 9});
-}
-
-LayoutItem customMargin(const QMargins &margin)
-{
-    LayoutItem item;
-    item.onAdd = [margin](LayoutBuilder &builder) {
-        if (auto layout = builder.stack.last().layout)
-            layout->setContentsMargins(margin);
-        else if (auto widget = builder.stack.last().widget)
-            widget->setContentsMargins(margin);
-    };
-    return item;
-}
-
-LayoutItem withFormAlignment()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) {
-        if (builder.stack.size() >= 2) {
-            if (auto widget = builder.stack.at(builder.stack.size() - 2).widget) {
-                const Qt::Alignment align(widget->style()->styleHint(QStyle::SH_FormLayoutLabelAlignment));
-                builder.stack.last().align = align;
+        // Set up label as buddy if possible.
+        const int lastRow = fl->rowCount() - 1;
+        QLayoutItem *l = fl->itemAt(lastRow, QFormLayout::LabelRole);
+        QLayoutItem *f = fl->itemAt(lastRow, QFormLayout::FieldRole);
+        if (l && f) {
+            if (QLabel *label = qobject_cast<QLabel *>(l->widget())) {
+                if (QWidget *widget = widgetForItem(f))
+                    label->setBuddy(widget);
             }
         }
-    };
-    return item;
+
+        pendingItems.clear();
+        return;
+    }
+
+    QTC_CHECK(false); // The other layouts shouldn't use flush()
+}
+
+void Layout::flush_() const
+{
+    const_cast<Layout *>(this)->flush();
+}
+
+void withFormAlignment(Layout *iface)
+{
+    iface->useFormAlignment = true;
+}
+
+// Flow
+
+Flow::Flow(std::initializer_list<I> ps)
+{
+    ptr = new FlowLayout;
+    apply(this, ps);
+    flush();
+}
+
+// Row & Column
+
+Row::Row(std::initializer_list<I> ps)
+{
+    ptr = new QHBoxLayout;
+    apply(this, ps);
+    flush();
+}
+
+Column::Column(std::initializer_list<I> ps)
+{
+    ptr = new QVBoxLayout;
+    apply(this, ps);
+    flush();
+}
+
+// Grid
+
+Grid::Grid()
+{
+    ptr = new QGridLayout;
+}
+
+Grid::Grid(std::initializer_list<I> ps)
+{
+    ptr = new QGridLayout;
+    apply(this, ps);
+    flush();
+}
+
+// Form
+
+Form::Form()
+{
+    ptr = new QFormLayout;
+}
+
+Form::Form(std::initializer_list<I> ps)
+{
+    auto lt = new QFormLayout;
+    ptr = lt;
+    lt->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+    apply(this, ps);
+    flush();
+}
+
+void Layout::fieldGrowthPolicy(int policy)
+{
+    if (auto lt = asForm())
+        lt->setFieldGrowthPolicy(QFormLayout::FieldGrowthPolicy(policy));
+}
+
+QWidget *Layout::emerge() const
+{
+    const_cast<Layout *>(this)->flush();
+    QWidget *widget = new QWidget;
+    widget->setLayout(access(this));
+    return widget;
 }
 
 // "Widgets"
 
-template <class T>
-void setupWidget(LayoutItem *item)
+Widget::Widget(std::initializer_list<I> ps)
 {
-    item->onAdd = [](LayoutBuilder &builder) { builder.stack.append(new T); };
-    item->onExit = widgetExit;
-};
-
-Widget::Widget(std::initializer_list<LayoutItem> items)
-{
-    this->subItems = items;
-    setupWidget<QWidget>(this);
+    ptr = new Implementation;
+    apply(this, ps);
 }
 
-Group::Group(std::initializer_list<LayoutItem> items)
+void Widget::resize(int w, int h)
 {
-    this->subItems = items;
-    setupWidget<QGroupBox>(this);
+    access(this)->resize(w, h);
 }
 
-Stack::Stack(std::initializer_list<LayoutItem> items)
+void Widget::setLayout(const Layout &layout)
 {
-    // We use a QStackedWidget instead of a QStackedLayout here because the latter will call
-    // "setVisible()" when a child is added, which can lead to the widget being spawned as a
-    // top-level widget. This can lead to the focus shifting away from the main application.
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) {
-        builder.stack.append(Slice(new QStackedWidget, true));
-    };
-    onExit = layoutingWidgetExit<QStackedWidget>;
+    access(this)->setLayout(access(&layout));
 }
 
-PushButton::PushButton(std::initializer_list<LayoutItem> items)
+void Widget::setWindowTitle(const QString &title)
 {
-    this->subItems = items;
-    setupWidget<QPushButton>(this);
+    access(this)->setWindowTitle(title);
 }
 
-SpinBox::SpinBox(std::initializer_list<LayoutItem> items)
+void Widget::setToolTip(const QString &title)
 {
-    this->subItems = items;
-    setupWidget<QSpinBox>(this);
+    access(this)->setToolTip(title);
 }
 
-TextEdit::TextEdit(std::initializer_list<LayoutItem> items)
+void Widget::show()
 {
-    this->subItems = items;
-    setupWidget<QTextEdit>(this);
+    access(this)->show();
 }
 
-Splitter::Splitter(std::initializer_list<LayoutItem> items)
+void Widget::noMargin(int)
 {
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) {
-        auto splitter = new QSplitter;
-        splitter->setOrientation(Qt::Vertical);
-        builder.stack.append(Slice(splitter, true));
-    };
-    onExit = layoutingWidgetExit<QSplitter>;
+    customMargin({});
 }
 
-ToolBar::ToolBar(std::initializer_list<LayoutItem> items)
+void Widget::normalMargin(int)
 {
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) {
-        auto toolbar = new QToolBar;
-        toolbar->setOrientation(Qt::Horizontal);
-        builder.stack.append(Slice(toolbar, true));
-    };
-    onExit = layoutingWidgetExit<QToolBar>;
+    customMargin({9, 9, 9, 9});
 }
 
-TabWidget::TabWidget(std::initializer_list<LayoutItem> items)
+void Widget::customMargin(const QMargins &margin)
 {
-    this->subItems = items;
-    setupWidget<QTabWidget>(this);
+    access(this)->setContentsMargins(margin);
 }
 
-// Special Tab
-
-Tab::Tab(const QString &tabName, const LayoutItem &item)
+QWidget *Widget::emerge() const
 {
-    onAdd = [item](LayoutBuilder &builder) {
-        auto tab = new QWidget;
-        builder.stack.append(tab);
-        item.attachTo(tab);
-    };
-    onExit = [tabName](LayoutBuilder &builder) {
-        QWidget *inner = builder.stack.last().widget;
-        builder.stack.pop_back();
-        auto tabWidget = qobject_cast<QTabWidget *>(builder.stack.last().widget);
-        QTC_ASSERT(tabWidget, return);
-        tabWidget->addTab(inner, tabName);
-    };
+    return access(this);
+}
+
+// Label
+
+Label::Label(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+Label::Label(const QString &text)
+{
+    ptr = new Implementation;
+    setText(text);
+}
+
+void Label::setText(const QString &text)
+{
+    access(this)->setText(text);
+}
+
+// Group
+
+Group::Group(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void Group::setTitle(const QString &title)
+{
+    access(this)->setTitle(title);
+    access(this)->setObjectName(title);
+}
+
+void Group::setGroupChecker(const std::function<void (QObject *)> &checker)
+{
+    checker(access(this));
+}
+
+// SpinBox
+
+SpinBox::SpinBox(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void SpinBox::setValue(int val)
+{
+    access(this)->setValue(val);
+}
+
+void SpinBox::onTextChanged(const std::function<void (QString)> &func)
+{
+    QObject::connect(access(this), &QSpinBox::textChanged, func);
+}
+
+// TextEdit
+
+TextEdit::TextEdit(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void TextEdit::setText(const QString &text)
+{
+    access(this)->setText(text);
+}
+
+// PushButton
+
+PushButton::PushButton(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void PushButton::setText(const QString &text)
+{
+    access(this)->setText(text);
+}
+
+void PushButton::onClicked(const std::function<void ()> &func, QObject *guard)
+{
+    QObject::connect(access(this), &QAbstractButton::clicked, guard, func);
+}
+
+// Stack
+
+// We use a QStackedWidget instead of a QStackedLayout here because the latter will call
+// "setVisible()" when a child is added, which can lead to the widget being spawned as a
+// top-level widget. This can lead to the focus shifting away from the main application.
+Stack::Stack(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void addToStack(Stack *stack, const Widget &inner)
+{
+    access(stack)->addWidget(inner.emerge());
+}
+
+void addToStack(Stack *stack, const Layout &inner)
+{
+    inner.flush_();
+    access(stack)->addWidget(inner.emerge());
+}
+
+void addToStack(Stack *stack, QWidget *inner)
+{
+    access(stack)->addWidget(inner);
+}
+
+// Splitter
+
+Splitter::Splitter(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    access(this)->setOrientation(Qt::Vertical);
+    apply(this, ps);
+}
+
+void addToSplitter(Splitter *splitter, QWidget *inner)
+{
+    access(splitter)->addWidget(inner);
+}
+
+void addToSplitter(Splitter *splitter, const Widget &inner)
+{
+    access(splitter)->addWidget(inner.emerge());
+}
+
+void addToSplitter(Splitter *splitter, const Layout &inner)
+{
+    inner.flush_();
+    access(splitter)->addWidget(inner.emerge());
+}
+
+// ToolBar
+
+ToolBar::ToolBar(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+    access(this)->setOrientation(Qt::Horizontal);
+}
+
+// TabWidget
+
+TabWidget::TabWidget(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+Tab::Tab(const QString &tabName, const Layout &inner)
+    : tabName(tabName), inner(inner)
+{}
+
+void addToTabWidget(TabWidget *tabWidget, const Tab &tab)
+{
+    access(tabWidget)->addTab(tab.inner.emerge(), tab.tabName);
 }
 
 // Special If
 
-If::If(bool condition, const LayoutItems &items, const LayoutItems &other)
+If::If(bool condition,
+   const std::initializer_list<Layout::I> ifcase,
+   const std::initializer_list<Layout::I> thencase)
+    : used(condition ? ifcase : thencase)
+{}
+
+void addToLayout(Layout *layout, const If &inner)
 {
-    subItems.append(condition ? items : other);
+    for (const Layout::I &item : inner.used)
+        item.apply(layout);
 }
 
-// Special Application
-
-Application::Application(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    setupWidget<QWidget>(this);
-    onExit = {}; // Hack: Don't dropp the last slice, we need the resulting widget.
-}
-
-int Application::exec(int &argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    LayoutBuilder builder;
-    addItemHelper(builder, *this);
-    if (QWidget *widget = builder.stack.last().widget)
-        widget->show();
-    return app.exec();
-}
-
-// "Properties"
-
-LayoutItem title(const QString &title)
-{
-    return [title](QObject *target) {
-        if (auto groupBox = qobject_cast<QGroupBox *>(target)) {
-            groupBox->setTitle(title);
-            groupBox->setObjectName(title);
-        } else if (auto widget = qobject_cast<QWidget *>(target)) {
-            widget->setWindowTitle(title);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem windowTitle(const QString &windowTitle)
-{
-    return [windowTitle](QObject *target) {
-        if (auto widget = qobject_cast<QWidget *>(target)) {
-            widget->setWindowTitle(windowTitle);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem text(const QString &text)
-{
-    return [text](QObject *target) {
-        if (auto button = qobject_cast<QAbstractButton *>(target)) {
-            button->setText(text);
-        } else if (auto textEdit = qobject_cast<QTextEdit *>(target)) {
-            textEdit->setText(text);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem tooltip(const QString &toolTip)
-{
-    return [toolTip](QObject *target) {
-        if (auto widget = qobject_cast<QWidget *>(target)) {
-            widget->setToolTip(toolTip);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem spacing(int spacing)
-{
-    return [spacing](QObject *target) {
-        if (auto layout = qobject_cast<QLayout *>(target)) {
-            layout->setSpacing(spacing);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem resize(int w, int h)
-{
-    return [w, h](QObject *target) {
-        if (auto widget = qobject_cast<QWidget *>(target)) {
-            widget->resize(w, h);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem columnStretch(int column, int stretch)
-{
-    return [column, stretch](QObject *target) {
-        if (auto grid = qobject_cast<QGridLayout *>(target)) {
-            grid->setColumnStretch(column, stretch);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem fieldGrowthPolicy(QFormLayout::FieldGrowthPolicy policy)
-{
-    return [policy](QObject *target) {
-        if (auto form = qobject_cast<QFormLayout *>(target)) {
-            form->setFieldGrowthPolicy(policy);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-
-// Id based setters
-
-LayoutItem id(ID &out)
-{
-    return [&out](QObject *target) { out.ob = target; };
-}
-
-void setText(ID id, const QString &text)
-{
-    if (auto textEdit = qobject_cast<QTextEdit *>(id.ob))
-        textEdit->setText(text);
-}
-
-// Signals
-
-LayoutItem onClicked(const std::function<void ()> &func, QObject *guard)
-{
-    return [func, guard](QObject *target) {
-        if (auto button = qobject_cast<QAbstractButton *>(target)) {
-            QObject::connect(button, &QAbstractButton::clicked, guard ? guard : target, func);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem onTextChanged(const std::function<void (const QString &)> &func, QObject *guard)
-{
-    return [func, guard](QObject *target) {
-        if (auto button = qobject_cast<QSpinBox *>(target)) {
-            QObject::connect(button, &QSpinBox::textChanged, guard ? guard : target, func);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem onValueChanged(const std::function<void (int)> &func, QObject *guard)
-{
-    return [func, guard](QObject *target) {
-        if (auto button = qobject_cast<QSpinBox *>(target)) {
-            QObject::connect(button, &QSpinBox::valueChanged, guard ? guard : target, func);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-// Convenience
+// Specials
 
 QWidget *createHr(QWidget *parent)
 {
@@ -1017,59 +928,49 @@ QWidget *createHr(QWidget *parent)
     return frame;
 }
 
-// Singletons.
+Span::Span(int cols, const Layout::I &item)
+    : item(item), spanCols(cols)
+{}
 
-LayoutItem::LayoutItem(const LayoutItem &t)
+Span::Span(int cols, int rows, const Layout::I &item)
+    : item(item), spanCols(cols), spanRows(rows)
+{}
+
+void addToLayout(Layout *layout, const Span &inner)
 {
-    operator=(t);
+    layout->addItem(inner.item);
+    if (layout->pendingItems.empty()) {
+        QTC_CHECK(inner.spanCols == 1 && inner.spanRows == 1);
+        return;
+    }
+    layout->pendingItems.back().spanCols = inner.spanCols;
+    layout->pendingItems.back().spanRows = inner.spanRows;
 }
 
-void createItem(LayoutItem *item,  LayoutItem(*t)())
+LayoutModifier spacing(int space)
 {
-    *item = t();
+    return [space](Layout *iface) { iface->setSpacing(space); };
 }
 
-void createItem(LayoutItem *item, const std::function<void(QObject *target)> &t)
+void addToLayout(Layout *layout, const Space &inner)
 {
-    item->setter = t;
+    if (auto lt = layout->asBox())
+        lt->addSpacing(inner.space);
 }
 
-void createItem(LayoutItem *item, QWidget *t)
+void addToLayout(Layout *layout, const Stretch &inner)
 {
-    if (auto l = qobject_cast<QLabel *>(t))
-        l->setTextInteractionFlags(l->textInteractionFlags() | Qt::TextSelectableByMouse);
-
-    item->onAdd = [t](LayoutBuilder &builder) { doAddWidget(builder, t); };
+    if (auto lt = layout->asBox())
+        lt->addStretch(inner.stretch);
 }
 
-void createItem(LayoutItem *item, QLayout *t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) { doAddLayout(builder, t); };
-}
+// void createItem(LayoutItem *item, QWidget *t)
+// {
+//     if (auto l = qobject_cast<QLabel *>(t))
+//         l->setTextInteractionFlags(l->textInteractionFlags() | Qt::TextSelectableByMouse);
 
-void createItem(LayoutItem *item, const QString &t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) { doAddText(builder, t); };
-}
+//     item->onAdd = [t](LayoutBuilder &builder) { doAddWidget(builder, t); };
+// }
 
-void createItem(LayoutItem *item, const Space &t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) { doAddSpace(builder, t); };
-}
-
-void createItem(LayoutItem *item, const Stretch &t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) { doAddStretch(builder, t); };
-}
-
-void createItem(LayoutItem *item, const Span &t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) {
-        addItemHelper(builder, t.item);
-        builder.stack.last().pendingItems.last().span = t.span;
-    };
-}
 
 } // Layouting
-
-#include "layoutbuilder.moc"
diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h
index c9fac7d8383..020ac32f9d0 100644
--- a/src/libs/utils/layoutbuilder.h
+++ b/src/libs/utils/layoutbuilder.h
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include <QFormLayout>
-#include <QList>
+#include <QMargins>
 #include <QString>
-#include <QtGlobal>
 
-#include <optional>
+#include <functional>
+#include <initializer_list>
+#include <vector>
 
 #if defined(UTILS_LIBRARY)
 #  define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
@@ -19,251 +19,536 @@
 #endif
 
 QT_BEGIN_NAMESPACE
+class QBoxLayout;
+class QFormLayout;
+class QGridLayout;
+class QGroupBox;
+class QHBoxLayout;
+class QLabel;
 class QLayout;
 class QMargins;
 class QObject;
+class QPushButton;
+class QSpinBox;
+class QSplitter;
+class QStackedWidget;
+class QTabWidget;
+class QTextEdit;
+class QToolBar;
+class QVBoxLayout;
 class QWidget;
-template <class T> T qobject_cast(QObject *object);
 QT_END_NAMESPACE
 
 namespace Layouting {
 
-// LayoutItem
+class NestId {};
 
-class LayoutBuilder;
-class LayoutItem;
-using LayoutItems = QList<LayoutItem>;
+template <typename T1, typename T2>
+class IdAndArg
+{
+public:
+    IdAndArg(const T1 &id, const T2 &arg) : id(id), arg(arg) {}
+    const T1 id;
+    const T2 arg; // FIXME: Could be const &, but this would currently break bindTo().
+};
+
+// The main dispatcher
+
+void doit(auto x, auto id, auto p);
+
+template <typename X> class BuilderItem
+{
+public:
+    // Nested child object
+    template <typename Inner>
+    BuilderItem(Inner && p)
+    {
+        apply = [&p](X *x) { doit(x, NestId{}, std::forward<Inner>(p)); };
+    }
+
+    // Property setter
+    template <typename Id, typename Arg>
+    BuilderItem(IdAndArg<Id, Arg> && idarg)
+    {
+        apply = [&idarg](X *x) { doit(x, idarg.id, idarg.arg); };
+    }
+
+    std::function<void(X *)> apply;
+};
+
+
+//////////////////////////////////////////////
+
+//
+// Basic
+//
+
+class QTCREATOR_UTILS_EXPORT Thing
+{
+public:
+    void *ptr; // The product.
+};
+
+class QTCREATOR_UTILS_EXPORT Object : public Thing
+{
+public:
+    using Implementation = QObject;
+    using I = BuilderItem<Object>;
+
+    Object() = default;
+    Object(std::initializer_list<I> ps);
+};
+
+//
+// Layouts
+//
+
+class FlowLayout;
+class Layout;
+using LayoutModifier = std::function<void(Layout *)>;
+// using LayoutModifier = void(*)(Layout *);
 
 class QTCREATOR_UTILS_EXPORT LayoutItem
 {
 public:
-    using Setter = std::function<void(QObject *target)>;
-
-    LayoutItem();
     ~LayoutItem();
+    LayoutItem();
+    LayoutItem(QLayout *l) : layout(l) {}
+    LayoutItem(QWidget *w) : widget(w) {}
+    LayoutItem(const QString &t) : text(t) {}
+    LayoutItem(const LayoutModifier &inner);
 
-    LayoutItem(const LayoutItem &t);
-    LayoutItem &operator=(const LayoutItem &t) = default;
-
-    template <class T> LayoutItem(const T &t)
-    {
-        if constexpr (std::is_base_of_v<LayoutItem, T>)
-            LayoutItem::operator=(t);
-        else
-            createItem(this, t);
-    }
-
-    void attachTo(QWidget *w) const;
-    QWidget *emerge();
-
-    void addItem(const LayoutItem &item);
-    void addItems(const LayoutItems &items);
-    void addRow(const LayoutItems &items);
-
-    std::function<void(LayoutBuilder &)> onAdd;
-    std::function<void(LayoutBuilder &)> onExit;
-    std::function<void(QObject *target)> setter;
-    LayoutItems subItems;
+    QString text;
+    QLayout *layout = nullptr;
+    QWidget *widget = nullptr;
+    int stretch = -1;
+    int spanCols = 1;
+    int spanRows = 1;
+    bool empty = false;
+    LayoutModifier ownerModifier;
+    //Qt::Alignment align = {};
 };
 
-// Special items
-
-class QTCREATOR_UTILS_EXPORT Space
+class QTCREATOR_UTILS_EXPORT Layout : public Object
 {
 public:
-    explicit Space(int space) : space(space) {}
-    const int space;
+    using Implementation = QLayout;
+    using I = BuilderItem<Layout>;
+
+    Layout() = default;
+    Layout(Implementation *w) { ptr = w; }
+
+    void span(int cols, int rows);
+    void noMargin();
+    void normalMargin();
+    void customMargin(const QMargins &margin);
+    void setColumnStretch(int cols, int rows);
+    void setSpacing(int space);
+
+    void attachTo(QWidget *);
+    void addItem(I item);
+    void addItems(std::initializer_list<I> items);
+    void addRow(std::initializer_list<I> items);
+    void addLayoutItem(const LayoutItem &item);
+
+    void flush();
+    void flush_() const;
+    void fieldGrowthPolicy(int policy);
+
+    QWidget *emerge() const;
+
+    QFormLayout *asForm();
+    QGridLayout *asGrid();
+    QBoxLayout *asBox();
+    FlowLayout *asFlow();
+
+    // Grid-only
+    int currentGridColumn = 0;
+    int currentGridRow = 0;
+    //Qt::Alignment align = {};
+    bool useFormAlignment = false;
+
+    std::vector<LayoutItem> pendingItems;
+};
+
+class QTCREATOR_UTILS_EXPORT Column : public Layout
+{
+public:
+    using Implementation = QVBoxLayout;
+    using I = BuilderItem<Column>;
+
+    Column(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Row : public Layout
+{
+public:
+    using Implementation = QHBoxLayout;
+    using I = BuilderItem<Row>;
+
+    Row(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Form : public Layout
+{
+public:
+    using Implementation = QFormLayout;
+    using I = BuilderItem<Form>;
+
+    Form();
+    Form(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Grid : public Layout
+{
+public:
+    using Implementation = QGridLayout;
+    using I = BuilderItem<Grid>;
+
+    Grid();
+    Grid(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Flow : public Layout
+{
+public:
+    Flow(std::initializer_list<I> ps);
 };
 
 class QTCREATOR_UTILS_EXPORT Stretch
 {
 public:
-    explicit Stretch(int stretch = 1) : stretch(stretch) {}
-    const int stretch;
+    explicit Stretch(int stretch) : stretch(stretch) {}
+
+    int stretch;
+};
+
+class QTCREATOR_UTILS_EXPORT Space
+{
+public:
+    explicit Space(int space) : space(space) {}
+
+    int space;
 };
 
 class QTCREATOR_UTILS_EXPORT Span
 {
 public:
-    Span(int span, const LayoutItem &item) : span(span), item(item) {}
-    const int span;
-    LayoutItem item;
+    Span(int cols, const Layout::I &item);
+    Span(int cols, int rows, const Layout::I &item);
+
+    Layout::I item;
+    int spanCols = 1;
+    int spanRows = 1;
 };
 
-class QTCREATOR_UTILS_EXPORT Column : public LayoutItem
+//
+// Widgets
+//
+
+class QTCREATOR_UTILS_EXPORT Widget : public Object
 {
 public:
-    Column(std::initializer_list<LayoutItem> items);
+    using Implementation = QWidget;
+    using I = BuilderItem<Widget>;
+
+    Widget() = default;
+    Widget(std::initializer_list<I> ps);
+    Widget(Implementation *w) { ptr = w; }
+
+    QWidget *emerge() const;
+
+    void show();
+    void resize(int, int);
+    void setLayout(const Layout &layout);
+    void setWindowTitle(const QString &);
+    void setToolTip(const QString &);
+    void noMargin(int = 0);
+    void normalMargin(int = 0);
+    void customMargin(const QMargins &margin);
 };
 
-class QTCREATOR_UTILS_EXPORT Row : public LayoutItem
+class QTCREATOR_UTILS_EXPORT Label : public Widget
 {
 public:
-    Row(std::initializer_list<LayoutItem> items);
+    using Implementation = QLabel;
+    using I = BuilderItem<Label>;
+
+    Label(std::initializer_list<I> ps);
+    Label(const QString &text);
+
+    void setText(const QString &);
 };
 
-class QTCREATOR_UTILS_EXPORT Flow : public LayoutItem
+class QTCREATOR_UTILS_EXPORT Group : public Widget
 {
 public:
-    Flow(std::initializer_list<LayoutItem> items);
+    using Implementation = QGroupBox;
+    using I = BuilderItem<Group>;
+
+    Group(std::initializer_list<I> ps);
+
+    void setTitle(const QString &);
+    void setGroupChecker(const std::function<void(QObject *)> &);
 };
 
-class QTCREATOR_UTILS_EXPORT Grid : public LayoutItem
+class QTCREATOR_UTILS_EXPORT SpinBox : public Widget
 {
 public:
-    Grid() : Grid({}) {}
-    Grid(std::initializer_list<LayoutItem> items);
+    using Implementation = QSpinBox;
+    using I = BuilderItem<SpinBox>;
+
+    SpinBox(std::initializer_list<I> ps);
+
+    void setValue(int);
+    void onTextChanged(const std::function<void(QString)> &);
 };
 
-class QTCREATOR_UTILS_EXPORT Form : public LayoutItem
+class QTCREATOR_UTILS_EXPORT PushButton : public Widget
 {
 public:
-    Form() : Form({}) {}
-    Form(std::initializer_list<LayoutItem> items);
+    using Implementation = QPushButton;
+    using I = BuilderItem<PushButton>;
+
+    PushButton(std::initializer_list<I> ps);
+
+    void setText(const QString &);
+    void onClicked(const std::function<void()> &, QObject *guard);
 };
 
-class QTCREATOR_UTILS_EXPORT Widget : public LayoutItem
+class QTCREATOR_UTILS_EXPORT TextEdit : public Widget
 {
 public:
-    Widget(std::initializer_list<LayoutItem> items);
+    using Implementation = QTextEdit;
+    using I = BuilderItem<TextEdit>;
+    using Id = Implementation *;
+
+    TextEdit(std::initializer_list<I> ps);
+
+    void setText(const QString &);
 };
 
-class QTCREATOR_UTILS_EXPORT Stack : public LayoutItem
+class QTCREATOR_UTILS_EXPORT Splitter : public Widget
 {
 public:
+    using Implementation = QSplitter;
+    using I = BuilderItem<Splitter>;
+
+    Splitter(std::initializer_list<I> items);
+};
+
+class QTCREATOR_UTILS_EXPORT Stack : public Widget
+{
+public:
+    using Implementation = QStackedWidget;
+    using I = BuilderItem<Stack>;
+
     Stack() : Stack({}) {}
-    Stack(std::initializer_list<LayoutItem> items);
+    Stack(std::initializer_list<I> items);
 };
 
-class QTCREATOR_UTILS_EXPORT Tab : public LayoutItem
+class QTCREATOR_UTILS_EXPORT Tab : public Widget
 {
 public:
-    Tab(const QString &tabName, const LayoutItem &item);
+    using Implementation = QWidget;
+
+    Tab(const QString &tabName, const Layout &inner);
+
+    const QString tabName;
+    const Layout inner;
 };
 
-class QTCREATOR_UTILS_EXPORT If : public LayoutItem
+class QTCREATOR_UTILS_EXPORT TabWidget : public Widget
 {
 public:
-    If(bool condition, const LayoutItems &item, const LayoutItems &other = {});
+    using Implementation = QTabWidget;
+    using I = BuilderItem<TabWidget>;
+
+    TabWidget(std::initializer_list<I> items);
 };
 
-class QTCREATOR_UTILS_EXPORT Group : public LayoutItem
+class QTCREATOR_UTILS_EXPORT ToolBar : public Widget
 {
 public:
-    Group(std::initializer_list<LayoutItem> items);
+    using Implementation = QToolBar;
+    using I = Layouting::BuilderItem<ToolBar>;
+
+    ToolBar(std::initializer_list<I> items);
 };
 
-class QTCREATOR_UTILS_EXPORT TextEdit : public LayoutItem
+// Special
+
+class QTCREATOR_UTILS_EXPORT If
 {
 public:
-    TextEdit(std::initializer_list<LayoutItem> items);
+    If(bool condition,
+       const std::initializer_list<Layout::I> ifcase,
+       const std::initializer_list<Layout::I> thencase = {});
+
+    const std::initializer_list<Layout::I> used;
 };
 
-class QTCREATOR_UTILS_EXPORT PushButton : public LayoutItem
+//
+// Dispatchers
+//
+
+// We need one 'Id' (and a corresponding function wrapping arguments into a
+// tuple marked by this id) per 'name' of "backend" setter member function,
+// i.e. one 'text' is sufficient for QLabel::setText, QLineEdit::setText.
+// The name of the Id does not have to match the backend names as it
+// is mapped per-backend-type in the respective setter implementation
+// but we assume that it generally makes sense to stay close to the
+// wrapped API name-wise.
+
+// These are free functions overloaded on the type of builder object
+// and setter id. The function implementations are independent, but
+// the base expectation is that they will forwards to the backend
+// type's setter.
+
+// Special dispatchers
+
+
+class BindToId {};
+
+template <typename T>
+auto bindTo(T **p)
 {
-public:
-    PushButton(std::initializer_list<LayoutItem> items);
-};
+    return IdAndArg{BindToId{}, p};
+}
 
-class QTCREATOR_UTILS_EXPORT SpinBox : public LayoutItem
+template <typename Interface>
+void doit(Interface *x, BindToId, auto p)
 {
-public:
-    SpinBox(std::initializer_list<LayoutItem> items);
-};
+    *p = static_cast<typename Interface::Implementation *>(x->ptr);
+}
 
-class QTCREATOR_UTILS_EXPORT Splitter : public LayoutItem
+class IdId {};
+auto id(auto p) { return IdAndArg{IdId{}, p}; }
+
+template <typename Interface>
+void doit(Interface *x, IdId, auto p)
 {
-public:
-    Splitter(std::initializer_list<LayoutItem> items);
-};
+    **p = static_cast<typename Interface::Implementation *>(x->ptr);
+}
 
-class QTCREATOR_UTILS_EXPORT ToolBar : public LayoutItem
+// Setter dispatchers
+
+class SizeId {};
+auto size(auto w, auto h) { return IdAndArg{SizeId{}, std::pair{w, h}}; }
+void doit(auto x, SizeId, auto p) { x->resize(p->first, p->second); }
+
+class TextId {};
+auto text(auto p) { return IdAndArg{TextId{}, p}; }
+void doit(auto x, TextId, auto p) { x->setText(p); }
+
+class TitleId {};
+auto title(auto p) { return IdAndArg{TitleId{}, p}; }
+void doit(auto x, TitleId, auto p) { x->setTitle(p); }
+
+class GroupCheckerId {};
+auto groupChecker(auto p) { return IdAndArg{GroupCheckerId{}, p}; }
+void doit(auto x, GroupCheckerId, auto p) { x->setGroupChecker(p); }
+
+class ToolTipId {};
+auto toolTip(auto p) { return IdAndArg{ToolTipId{}, p}; }
+void doit(auto x, ToolTipId, auto p) { x->setToolTip(p); }
+
+class WindowTitleId {};
+auto windowTitle(auto p) { return IdAndArg{WindowTitleId{}, p}; }
+void doit(auto x, WindowTitleId, auto p) { x->setWindowTitle(p); }
+
+class OnTextChangedId {};
+auto onTextChanged(auto p) { return IdAndArg{OnTextChangedId{}, p}; }
+void doit(auto x, OnTextChangedId, auto p) { x->onTextChanged(p); }
+
+class OnClickedId {};
+auto onClicked(auto p, auto guard) { return IdAndArg{OnClickedId{}, std::pair{p, guard}}; }
+void doit(auto x, OnClickedId, auto p) { x->onClicked(p.first, p.second); }
+
+class CustomMarginId {};
+inline auto customMargin(const QMargins &p) { return IdAndArg{CustomMarginId{}, p}; }
+void doit(auto x, CustomMarginId, auto p) { x->customMargin(p); }
+
+class FieldGrowthPolicyId {};
+inline auto fieldGrowthPolicy(auto p) { return IdAndArg{FieldGrowthPolicyId{}, p}; }
+void doit(auto x, FieldGrowthPolicyId, auto p) { x->fieldGrowthPolicy(p); }
+
+class ColumnStretchId {};
+inline auto columnStretch(int column, int stretch) { return IdAndArg{ColumnStretchId{}, std::pair{column, stretch}}; }
+void doit(auto x, ColumnStretchId, auto p) { x->setColumnStretch(p.first, p.second); }
+
+// Nesting dispatchers
+
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Layout &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Widget &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, QWidget *inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, QLayout *inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const LayoutModifier &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const QString &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Space &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Stretch &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const If &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Span &inner);
+// ... can be added to anywhere later to support "user types"
+
+QTCREATOR_UTILS_EXPORT void addToWidget(Widget *widget, const Layout &layout);
+
+QTCREATOR_UTILS_EXPORT void addToTabWidget(TabWidget *tabWidget, const Tab &inner);
+
+QTCREATOR_UTILS_EXPORT void addToSplitter(Splitter *splitter, QWidget *inner);
+QTCREATOR_UTILS_EXPORT void addToSplitter(Splitter *splitter, const Widget &inner);
+QTCREATOR_UTILS_EXPORT void addToSplitter(Splitter *splitter, const Layout &inner);
+
+QTCREATOR_UTILS_EXPORT void addToStack(Stack *stack, QWidget *inner);
+QTCREATOR_UTILS_EXPORT void addToStack(Stack *stack, const Widget &inner);
+QTCREATOR_UTILS_EXPORT void addToStack(Stack *stack, const Layout &inner);
+
+template <class Inner>
+void doit_nested(Layout *outer, Inner && inner)
 {
-public:
-    ToolBar(std::initializer_list<LayoutItem> items);
-};
+    addToLayout(outer, std::forward<Inner>(inner));
+}
 
-class QTCREATOR_UTILS_EXPORT TabWidget : public LayoutItem
+void doit_nested(Widget *outer, auto inner)
 {
-public:
-    TabWidget(std::initializer_list<LayoutItem> items);
-};
+    addToWidget(outer, inner);
+}
 
-class QTCREATOR_UTILS_EXPORT Application : public LayoutItem
+void doit_nested(TabWidget *outer, auto inner)
 {
-public:
-    Application(std::initializer_list<LayoutItem> items);
+    addToTabWidget(outer, inner);
+}
 
-    int exec(int &argc, char *argv[]);
-};
-
-
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const std::function<void(QObject *target)> &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, QWidget *t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, QLayout *t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, LayoutItem(*t)());
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const QString &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Span &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Space &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Stretch &t);
-
-
-// "Singletons"
-
-QTCREATOR_UTILS_EXPORT LayoutItem br();
-QTCREATOR_UTILS_EXPORT LayoutItem st();
-QTCREATOR_UTILS_EXPORT LayoutItem empty();
-QTCREATOR_UTILS_EXPORT LayoutItem hr();
-QTCREATOR_UTILS_EXPORT LayoutItem noMargin();
-QTCREATOR_UTILS_EXPORT LayoutItem normalMargin();
-QTCREATOR_UTILS_EXPORT LayoutItem customMargin(const QMargins &margin);
-QTCREATOR_UTILS_EXPORT LayoutItem withFormAlignment();
-
-// "Setters"
-
-QTCREATOR_UTILS_EXPORT LayoutItem title(const QString &title);
-QTCREATOR_UTILS_EXPORT LayoutItem text(const QString &text);
-QTCREATOR_UTILS_EXPORT LayoutItem tooltip(const QString &toolTip);
-QTCREATOR_UTILS_EXPORT LayoutItem resize(int, int);
-QTCREATOR_UTILS_EXPORT LayoutItem columnStretch(int column, int stretch);
-QTCREATOR_UTILS_EXPORT LayoutItem spacing(int);
-QTCREATOR_UTILS_EXPORT LayoutItem windowTitle(const QString &windowTitle);
-QTCREATOR_UTILS_EXPORT LayoutItem fieldGrowthPolicy(QFormLayout::FieldGrowthPolicy policy);
-
-
-// "Getters"
-
-class ID
+void doit_nested(Stack *outer, auto inner)
 {
-public:
-    QObject *ob = nullptr;
-};
+    addToStack(outer, inner);
+}
 
-QTCREATOR_UTILS_EXPORT LayoutItem id(ID &out);
+void doit_nested(Splitter *outer, auto inner)
+{
+    addToSplitter(outer, inner);
+}
 
-QTCREATOR_UTILS_EXPORT void setText(ID id, const QString &text);
+template <class Inner>
+void doit(auto outer, NestId, Inner && inner)
+{
+    doit_nested(outer, std::forward<Inner>(inner));
+}
 
+// Special layout items
 
-// "Signals"
+QTCREATOR_UTILS_EXPORT void empty(Layout *);
+QTCREATOR_UTILS_EXPORT void br(Layout *);
+QTCREATOR_UTILS_EXPORT void st(Layout *);
+QTCREATOR_UTILS_EXPORT void noMargin(Layout *);
+QTCREATOR_UTILS_EXPORT void normalMargin(Layout *);
+QTCREATOR_UTILS_EXPORT void withFormAlignment(Layout *);
+QTCREATOR_UTILS_EXPORT void hr(Layout *);
 
-QTCREATOR_UTILS_EXPORT LayoutItem onClicked(const std::function<void()> &,
-                                            QObject *guard = nullptr);
-QTCREATOR_UTILS_EXPORT LayoutItem onTextChanged(const std::function<void(const QString &)> &,
-                                                QObject *guard = nullptr);
-QTCREATOR_UTILS_EXPORT LayoutItem onValueChanged(const std::function<void(int)> &,
-                                                QObject *guard = nullptr);
-
-QTCREATOR_UTILS_EXPORT LayoutItem onTextChanged(ID &id, QVariant(*sig)(QObject *));
+QTCREATOR_UTILS_EXPORT LayoutModifier spacing(int space);
 
 // Convenience
 
 QTCREATOR_UTILS_EXPORT QWidget *createHr(QWidget *parent = nullptr);
 
-template <class T>
-LayoutItem bindTo(T **out)
-{
-    return [out](QObject *target) { *out = qobject_cast<T *>(target); };
-}
-
-
 } // Layouting
diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp
index 1f32cce6bcc..1ec503b7acf 100644
--- a/src/libs/utils/projectintropage.cpp
+++ b/src/libs/utils/projectintropage.cpp
@@ -110,7 +110,8 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
     using namespace Layouting;
 
     Form {
-        Tr::tr("Name:"), d->m_nameLineEdit, br,
+        Tr::tr("Name:"), d->m_nameLineEdit,
+                br,
         d->m_projectLabel, d->m_projectComboBox, br,
         Column { Space(12) }, br,
         Tr::tr("Create in:"), d->m_pathChooser, br,
diff --git a/src/plugins/autotest/ctest/ctesttool.cpp b/src/plugins/autotest/ctest/ctesttool.cpp
index d60363663f5..69e75e6a018 100644
--- a/src/plugins/autotest/ctest/ctesttool.cpp
+++ b/src/plugins/autotest/ctest/ctesttool.cpp
@@ -43,15 +43,15 @@ CTestTool::CTestTool()
             outputMode, br,
             Group {
                 title(Tr::tr("Repeat Tests")),
-                repeat.groupChecker(),
+                groupChecker(repeat.groupChecker()),
                 Row { repetitionMode, repetitionCount},
             }, br,
             Group {
                 title(Tr::tr("Run in Parallel")),
-                parallel.groupChecker(),
+                groupChecker(parallel.groupChecker()),
                 Column {
                     Row { jobs }, br,
-                    Row { testLoad, threshold}
+                    Row { testLoad, threshold }
                 }
             }
         }, st };
diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp
index 2a4bfa6fd35..b6347f52a70 100644
--- a/src/plugins/autotest/projectsettingswidget.cpp
+++ b/src/plugins/autotest/projectsettingswidget.cpp
@@ -92,13 +92,13 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
                     m_runAfterBuild,
                     st,
                 },
-                noMargin(),
+                noMargin,
             },
         },
         Row { // explicitly outside of the global settings
             Group {
                 title(Tr::tr("Limit Files to Path Patterns")),
-                m_applyFilter.groupChecker(),
+                groupChecker(m_applyFilter.groupChecker()),
                 Column {
                     filterLabel,
                     Row {
@@ -108,7 +108,7 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
                 },
             },
         },
-        noMargin(),
+        noMargin,
     }.attachTo(this);
     // clang-format on
 
diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp
index f74716b8e20..1b2c7cbd6e0 100644
--- a/src/plugins/autotest/testsettingspage.cpp
+++ b/src/plugins/autotest/testsettingspage.cpp
@@ -75,7 +75,7 @@ TestSettingsWidget::TestSettingsWidget()
 
     PushButton resetChoicesButton {
         text(Tr::tr("Reset Cached Choices")),
-        tooltip(Tr::tr("Clear all cached choices of run configurations for "
+        Layouting::toolTip(Tr::tr("Clear all cached choices of run configurations for "
                        "tests where the executable could not be deduced.")),
         onClicked(&clearChoiceCache, this)
     };
diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp
index 22bcea77f79..d964fe30b1b 100644
--- a/src/plugins/beautifier/clangformat/clangformat.cpp
+++ b/src/plugins/beautifier/clangformat/clangformat.cpp
@@ -270,7 +270,8 @@ public:
                 title(Tr::tr("Options")),
                 bindTo(&options),
                 Form {
-                    s.usePredefinedStyle.adoptButton(predefinedStyleButton), predefinedBlob, br,
+                    s.usePredefinedStyle.adoptButton(predefinedStyleButton),
+                    predefinedBlob, br,
                     customizedStyleButton, configurations,
                 },
             },
diff --git a/src/plugins/beautifier/generalsettings.cpp b/src/plugins/beautifier/generalsettings.cpp
index be80de39385..413e80698fb 100644
--- a/src/plugins/beautifier/generalsettings.cpp
+++ b/src/plugins/beautifier/generalsettings.cpp
@@ -50,7 +50,7 @@ GeneralSettings::GeneralSettings()
         return Column {
             Group {
                 title(Tr::tr("Automatic Formatting on File Save")),
-                autoFormatOnSave.groupChecker(),
+                groupChecker(autoFormatOnSave.groupChecker()),
                 Form {
                     autoFormatTools, br,
                     autoFormatMime, br,
diff --git a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
index 65017b92ad5..27629823426 100644
--- a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
@@ -26,6 +26,7 @@
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QGroupBox>
 #include <QLabel>
 #include <QSpinBox>
 
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 0106ec5896c..40d2778712a 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -342,7 +342,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
                 Column {
                     cmakeConfiguration,
                     Row {
-                        bc->initialCMakeArguments, br,
+                        bc->initialCMakeArguments,
                         bc->additionalCMakeOptions
                     },
                     m_reconfigureButton,
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 6663b311a42..7da98f8e617 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -600,7 +600,7 @@ QWidget *CMakeBuildStep::createConfigWidget()
     if (!isCleanStep() && !m_buildPreset.isEmpty())
         createAndAddEnvironmentWidgets(builder);
 
-    builder.addItem(Layouting::noMargin);
+    builder.noMargin();
     auto widget = builder.emerge();
 
     updateDetails();
diff --git a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
index 4cbd4d2d50e..c21b12a93aa 100644
--- a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
@@ -79,7 +79,7 @@ public:
                 Space(10),
                 Group {
                     title(Tr::tr("Automatic Formatting on File Save")),
-                    autoFormatOnSave.groupChecker(),
+                    groupChecker(autoFormatOnSave.groupChecker()),
                     // Conceptually, that's a Form, but this would look odd:
                     // xxxxxx [____]
                     //        [x] xxxxxxxxxxxxxx
diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
index d55f3b506b8..46ae5870a0d 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
@@ -148,7 +148,7 @@ private:
     // KitAspectWidget interface
     void makeReadOnly() override { m_comboBox->setEnabled(false); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_comboBox);
         builder.addItem(m_comboBox);
@@ -376,7 +376,7 @@ private:
     // KitAspectWidget interface
     void makeReadOnly() override { m_changeButton->setEnabled(false); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_label);
         parent.addItem(m_label);
@@ -875,7 +875,7 @@ public:
 
 private:
     // KitAspectWidget interface
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_summaryLabel);
         parent.addItem(m_summaryLabel);
diff --git a/src/plugins/compilerexplorer/compilerexploreraspects.cpp b/src/plugins/compilerexplorer/compilerexploreraspects.cpp
index 9096b7dabeb..1c1a8e6b96c 100644
--- a/src/plugins/compilerexplorer/compilerexploreraspects.cpp
+++ b/src/plugins/compilerexplorer/compilerexploreraspects.cpp
@@ -91,7 +91,7 @@ void LibrarySelectionAspect::setVariantValue(const QVariant &value, Announcement
     setValue(map, howToAnnounce);
 }
 
-void LibrarySelectionAspect::addToLayout(Layouting::LayoutItem &parent)
+void LibrarySelectionAspect::addToLayout(Layouting::Layout &parent)
 {
     using namespace Layouting;
 
@@ -223,12 +223,12 @@ void LibrarySelectionAspect::addToLayout(Layouting::LayoutItem &parent)
     // clang-format off
     QStackedWidget *stack = static_cast<QStackedWidget*>(
         Stack {
-            noMargin,
             Row { noMargin, displayLabel, editBtn },
             Row { noMargin, nameCombo, versionCombo, clearBtn }
         }.emerge()
     );
     // clang-format on
+    stack->setContentsMargins({});
     connect(editBtn, &QPushButton::clicked, stack, [stack] { stack->setCurrentIndex(1); });
     connect(this, &LibrarySelectionAspect::returnToDisplay, stack, [stack] {
         stack->setCurrentIndex(0);
diff --git a/src/plugins/compilerexplorer/compilerexploreraspects.h b/src/plugins/compilerexplorer/compilerexploreraspects.h
index c89604b7aa1..bb2e86a2688 100644
--- a/src/plugins/compilerexplorer/compilerexploreraspects.h
+++ b/src/plugins/compilerexplorer/compilerexploreraspects.h
@@ -68,7 +68,7 @@ public:
 
     LibrarySelectionAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     using ResultCallback = std::function<void(QList<QStandardItem *>)>;
     using FillCallback = std::function<void(ResultCallback)>;
diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.cpp b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
index e1e564c7333..f14ebf4dbff 100644
--- a/src/plugins/compilerexplorer/compilerexplorereditor.cpp
+++ b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
@@ -264,7 +264,7 @@ SourceEditorWidget::SourceEditorWidget(const std::shared_ptr<SourceSettings> &se
     Column {
         toolBar,
         m_codeEditor,
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
     // clang-format on
 
@@ -370,7 +370,6 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
     connect(m_asmEditor, &AsmEditorWidget::gotFocus, this, &CompilerWidget::gotFocus);
 
     auto advButton = new QToolButton;
-    QSplitter *splitter{nullptr};
 
     auto advDlg = new QAction;
     advDlg->setIcon(Utils::Icons::SETTINGS_TOOLBAR.icon());
@@ -400,7 +399,6 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
     });
 
     // clang-format off
-
     Row {
         m_compilerSettings->compiler,
         advButton,
@@ -411,11 +409,10 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
     Column {
         toolBar,
         Splitter {
-            bindTo(&splitter),
             m_asmEditor,
             createTerminal()
         },
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
     // clang-format on
 
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index 05fb7e3e13f..46d4d311356 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -461,7 +461,7 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
     QVBoxLayout *vlayout;
 
     using namespace Layouting;
-    Row { fancyButton, noMargin() }.attachTo(bar);
+    Row { fancyButton, noMargin }.attachTo(bar);
     Row {
         Widget {
             bindTo(&m_selectionWidget),
@@ -471,13 +471,13 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
                 st,
                 Widget {
                     bindTo(&m_cornerWidgetContainer),
-                    Column { st, spacing(0), noMargin() },
+                    Column { st, spacing(0), noMargin },
                 },
-                spacing(0),  noMargin(),
+                spacing(0), noMargin,
             },
         },
         Column { bindTo(&vlayout), m_modesStack, m_statusBar, spacing(0) },
-        spacing(1), noMargin(),
+        spacing(1), noMargin,
     }.attachTo(this);
 
     m_selectionWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
diff --git a/src/plugins/coreplugin/loggingviewer.cpp b/src/plugins/coreplugin/loggingviewer.cpp
index d6aad897148..427b0a064c3 100644
--- a/src/plugins/coreplugin/loggingviewer.cpp
+++ b/src/plugins/coreplugin/loggingviewer.cpp
@@ -715,7 +715,7 @@ LoggingViewManagerWidget::LoggingViewManagerWidget(QWidget *parent)
         Splitter {
             bindTo(&splitter),
             Column {
-                noMargin(),
+                noMargin,
                 Row {
                     spacing(0),
                     save,
@@ -729,7 +729,7 @@ LoggingViewManagerWidget::LoggingViewManagerWidget(QWidget *parent)
                 m_logView
             },
             Column {
-                noMargin(),
+                noMargin,
                 Row {
                     qtInternal,
                     filterEdit,
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 48ba6224182..90475d3abc8 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -410,14 +410,14 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
         m_opToolBarWidgets,
         minMaxButton,
         closeButton,
-        spacing(0), noMargin(),
+        spacing(0), noMargin,
     }.attachTo(toolBar);
 
     Column {
         toolBar,
         m_outputWidgetPane,
         new FindToolBarPlaceHolder(this),
-        spacing(0), noMargin(),
+        spacing(0), noMargin,
     }.attachTo(this);
 
     Row {
@@ -503,7 +503,7 @@ void OutputPaneManager::initialize()
 
         QWidget *toolButtonsContainer = new QWidget(m_instance->m_opToolBarWidgets);
         using namespace Layouting;
-        Row toolButtonsRow { spacing(0), noMargin() };
+        Row toolButtonsRow { spacing(0), noMargin };
         const QList<QWidget *> toolBarWidgets = outPane->toolBarWidgets();
         for (QWidget *toolButton : toolBarWidgets)
             toolButtonsRow.addItem(toolButton);
diff --git a/src/plugins/cppcheck/cppchecksettings.cpp b/src/plugins/cppcheck/cppchecksettings.cpp
index 142d3ac236f..144ed112f36 100644
--- a/src/plugins/cppcheck/cppchecksettings.cpp
+++ b/src/plugins/cppcheck/cppchecksettings.cpp
@@ -111,7 +111,7 @@ CppcheckSettings::CppcheckSettings()
     readSettings();
 }
 
-std::function<Layouting::LayoutItem()> CppcheckSettings::layouter()
+std::function<Layouting::Layout()> CppcheckSettings::layouter()
 {
     return [this] {
         using namespace Layouting;
diff --git a/src/plugins/cppcheck/cppchecksettings.h b/src/plugins/cppcheck/cppchecksettings.h
index 8842b2b65f2..c5b4a78a676 100644
--- a/src/plugins/cppcheck/cppchecksettings.h
+++ b/src/plugins/cppcheck/cppchecksettings.h
@@ -14,7 +14,7 @@ class CppcheckSettings final : public Utils::AspectContainer
 public:
     CppcheckSettings();
 
-    std::function<Layouting::LayoutItem()> layouter();
+    std::function<Layouting::Layout()> layouter();
 
     Utils::FilePathAspect binary{this};
     Utils::BoolAspect warning{this};
diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
index 542edbd57a7..56c62dfca07 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
@@ -1445,11 +1445,11 @@ CppCodeModelInspectorDialog::CppCodeModelInspectorDialog(QWidget *parent)
         Tab("&Defines",
             Column {
                 Group {
-                    title("Toolchain Defines"),
+                    title(QString("Toolchain Defines")),
                     Column { m_partToolchainDefinesEdit },
                 },
                 Group {
-                    title("Project Defines"),
+                    title(QString("Project Defines")),
                     Column { m_partProjectDefinesEdit },
                 }
             }
diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp
index bb24d674a09..5739845fe65 100644
--- a/src/plugins/debugger/commonoptionspage.cpp
+++ b/src/plugins/debugger/commonoptionspage.cpp
@@ -157,7 +157,7 @@ CommonSettings::CommonSettings()
         };
 
         return Column {
-            Group { title("Behavior"), Row { col1, col2, st } },
+            Group { title(Tr::tr("Behavior")), Row { col1, col2, st } },
             sourcePathMap,
             st
         };
diff --git a/src/plugins/debugger/commonoptionspage.h b/src/plugins/debugger/commonoptionspage.h
index 5bf41af7a41..4d391280e81 100644
--- a/src/plugins/debugger/commonoptionspage.h
+++ b/src/plugins/debugger/commonoptionspage.h
@@ -25,7 +25,7 @@ public:
     void fromMap(const Utils::Store &map) override;
     void toMap(Utils::Store &map) const override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void readSettings() override;
     void writeSettings() const override;
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index 2e1c5ab275f..b93e0800dec 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -379,7 +379,7 @@ DebuggerItemConfigWidget::DebuggerItemConfigWidget()
     // clang-format off
     using namespace Layouting;
     Form {
-        fieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow),
+        fieldGrowthPolicy(int(QFormLayout::AllNonFixedFieldsGrow)),
         Tr::tr("Name:"), m_displayNameLineEdit, br,
         Tr::tr("Path:"), m_binaryChooser, br,
         m_cdbLabel, br,
diff --git a/src/plugins/debugger/debuggerkitaspect.cpp b/src/plugins/debugger/debuggerkitaspect.cpp
index d7952f69cc3..10559a70840 100644
--- a/src/plugins/debugger/debuggerkitaspect.cpp
+++ b/src/plugins/debugger/debuggerkitaspect.cpp
@@ -66,7 +66,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_comboBox);
         parent.addItem(m_comboBox);
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index d4f4361f78c..dc1919ce8b0 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -72,7 +72,7 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
         details->setState(DetailsWidget::Expanded);
         auto innerPane = new QWidget;
         details->setWidget(innerPane);
-        builder.addItem(Layouting::noMargin);
+        builder.noMargin();
         builder.attachTo(innerPane);
 
         const auto setSummaryText = [this, details] {
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
index be983cf584c..98b84e2020e 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
@@ -467,7 +467,7 @@ bool SourcePathMapAspect::isDirty()
     return m_internal != m_buffer;
 }
 
-void SourcePathMapAspect::addToLayout(Layouting::LayoutItem &parent)
+void SourcePathMapAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(!d->m_widget);
     d->m_widget = createSubWidget<DebuggerSourcePathMappingWidget>();
diff --git a/src/plugins/extensionmanager/extensionmanagerwidget.cpp b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
index d8574a740fe..12a31e6368c 100644
--- a/src/plugins/extensionmanager/extensionmanagerwidget.cpp
+++ b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
@@ -73,24 +73,24 @@ ExtensionManagerWidget::ExtensionManagerWidget()
     Row {
         WelcomePageHelpers::createRule(Qt::Vertical),
         m_secondaryDescription,
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(m_secondarDescriptionWidget);
 
     Row {
         WelcomePageHelpers::createRule(Qt::Vertical),
         Row {
             m_primaryDescription,
-            noMargin(),
+            noMargin,
         },
         m_secondarDescriptionWidget,
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(descriptionColumns);
 
     Row {
         Space(StyleHelper::SpacingTokens::ExVPaddingGapXl),
         m_leftColumn,
         descriptionColumns,
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
 
     WelcomePageHelpers::setBackgroundColor(this, Theme::Token_Background_Default);
diff --git a/src/plugins/extensionmanager/extensionsbrowser.cpp b/src/plugins/extensionmanager/extensionsbrowser.cpp
index 48eff3a16ac..49fb32c8050 100644
--- a/src/plugins/extensionmanager/extensionsbrowser.cpp
+++ b/src/plugins/extensionmanager/extensionsbrowser.cpp
@@ -457,7 +457,7 @@ ExtensionsBrowser::ExtensionsBrowser()
         Row { m_searchBox, st, m_updateButton, Space(extraListViewWidth() + gapSize) },
         Space(gapSize),
         m_extensionsView,
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
 
     WelcomePageHelpers::setBackgroundColor(this, Theme::Token_Background_Default);
diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp
index 3fd3e9c31f4..e6a2a661d52 100644
--- a/src/plugins/fakevim/fakevimactions.cpp
+++ b/src/plugins/fakevim/fakevimactions.cpp
@@ -139,7 +139,7 @@ FakeVimSettings::FakeVimSettings()
                 startOfLine,
                 passKeys,
                 blinkingCursor,
-                HostOsInfo::isWindowsHost() ? LayoutItem(systemEncoding) : empty
+                If { HostOsInfo::isWindowsHost(), { systemEncoding } }
             },
             Column {
                 incSearch,
@@ -199,7 +199,7 @@ FakeVimSettings::FakeVimSettings()
                         autoIndent.setValue(true);
                         smartIndent.setValue(tps.m_autoIndent);
                         incSearch.setValue(true);
-                    }),
+                    }, nullptr),
                 },
                 PushButton {
                     text(Tr::tr("Set Qt Style")),
@@ -213,7 +213,7 @@ FakeVimSettings::FakeVimSettings()
                         incSearch.setVolatileValue(true);
                         backspace.setVolatileValue(QString("indent,eol,start"));
                         passKeys.setVolatileValue(true);
-                    }),
+                    }, nullptr),
                 },
                 PushButton {
                     text(Tr::tr("Set Plain Style")),
@@ -227,7 +227,7 @@ FakeVimSettings::FakeVimSettings()
                         incSearch.setVolatileValue(false);
                         backspace.setVolatileValue(QString());
                         passKeys.setVolatileValue(false);
-                    }),
+                    }, nullptr),
                  },
                  st
             },
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp
index 2e7f8bf2de4..f8056d9a00a 100644
--- a/src/plugins/git/gitsettings.cpp
+++ b/src/plugins/git/gitsettings.cpp
@@ -151,7 +151,7 @@ GitSettings::GitSettings()
 
             Group {
                 title(Tr::tr("Instant Blame")),
-                instantBlame.groupChecker(),
+                groupChecker(instantBlame.groupChecker()),
                 Row { instantBlameIgnoreSpaceChanges, instantBlameIgnoreLineMoves, st },
             },
 
diff --git a/src/plugins/gitlab/gitlaboptionspage.cpp b/src/plugins/gitlab/gitlaboptionspage.cpp
index d550dd48452..03d078ba14e 100644
--- a/src/plugins/gitlab/gitlaboptionspage.cpp
+++ b/src/plugins/gitlab/gitlaboptionspage.cpp
@@ -102,7 +102,7 @@ GitLabServerWidget::GitLabServerWidget(Mode m, QWidget *parent)
             m_token, br,
             m_port, br,
             m_secure,
-            m == Edit ? normalMargin : noMargin
+            m == Edit ? &Layout::normalMargin : &Layout::noMargin
         },
     }.attachTo(this);
 }
diff --git a/src/plugins/incredibuild/commandbuilderaspect.cpp b/src/plugins/incredibuild/commandbuilderaspect.cpp
index 99c29cd2692..38d0d858e8e 100644
--- a/src/plugins/incredibuild/commandbuilderaspect.cpp
+++ b/src/plugins/incredibuild/commandbuilderaspect.cpp
@@ -112,7 +112,7 @@ void CommandBuilderAspectPrivate::tryToMigrate()
     }
 }
 
-void CommandBuilderAspect::addToLayout(Layouting::LayoutItem &parent)
+void CommandBuilderAspect::addToLayout(Layouting::Layout &parent)
 {
     if (!d->commandBuilder) {
         d->commandBuilder = new QComboBox;
diff --git a/src/plugins/incredibuild/commandbuilderaspect.h b/src/plugins/incredibuild/commandbuilderaspect.h
index 3282a18415f..2035a1c3090 100644
--- a/src/plugins/incredibuild/commandbuilderaspect.h
+++ b/src/plugins/incredibuild/commandbuilderaspect.h
@@ -23,7 +23,7 @@ public:
     QString fullCommandFlag(bool keepJobNum) const;
 
 private:
-    void addToLayout(Layouting::LayoutItem &parent) final;
+    void addToLayout(Layouting::Layout &parent) final;
     void fromMap(const Utils::Store &map) final;
     void toMap(Utils::Store &map) const final;
 
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 23a27e85f6a..3fc8c75950f 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -337,7 +337,7 @@ IosDeviceTypeAspect::IosDeviceTypeAspect(AspectContainer *container, IosRunConfi
             this, &IosDeviceTypeAspect::deviceChanges);
 }
 
-void IosDeviceTypeAspect::addToLayout(Layouting::LayoutItem &parent)
+void IosDeviceTypeAspect::addToLayout(Layouting::Layout &parent)
 {
     m_deviceTypeComboBox = new QComboBox;
     m_deviceTypeComboBox->setModel(&m_deviceTypeModel);
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index 524369605c6..4defcf36ee8 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -31,7 +31,7 @@ public:
 
     void fromMap(const Utils::Store &map) override;
     void toMap(Utils::Store &map) const override;
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     IosDeviceType deviceType() const;
     void setDeviceType(const IosDeviceType &deviceType);
diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp
index b994da6096c..4176918015c 100644
--- a/src/plugins/languageclient/languageclientsettings.cpp
+++ b/src/plugins/languageclient/languageclientsettings.cpp
@@ -40,6 +40,7 @@
 #include <QDialogButtonBox>
 #include <QDir>
 #include <QFileInfo>
+#include <QFormLayout>
 #include <QGroupBox>
 #include <QHeaderView>
 #include <QJsonDocument>
@@ -817,8 +818,8 @@ static QString startupBehaviorString(BaseSettings::StartBehavior behavior)
     return {};
 }
 
-BaseSettingsWidget::BaseSettingsWidget(
-    const BaseSettings *settings, QWidget *parent, Layouting::LayoutItems additionalItems)
+BaseSettingsWidget::BaseSettingsWidget(const BaseSettings *settings, QWidget *parent,
+                                       Layouting::LayoutModifier additionalItems)
     : QWidget(parent)
     , m_name(new QLineEdit(settings->m_name, this))
     , m_mimeTypes(new QLabel(settings->m_languageFilter.mimeTypes.join(filterSeparator), this))
@@ -878,7 +879,10 @@ BaseSettingsWidget::BaseSettingsWidget(
         Tr::tr("Initialization options:"), m_initializationOptions, br
 
     };
-    form.addItems(additionalItems);
+
+    if (additionalItems)
+        additionalItems(&form);
+
     form.attachTo(this);
     // clang-format on
 }
diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h
index 9ffc02dfdd7..a6055577bc3 100644
--- a/src/plugins/languageclient/languageclientsettings.h
+++ b/src/plugins/languageclient/languageclientsettings.h
@@ -159,7 +159,7 @@ public:
     explicit BaseSettingsWidget(
         const BaseSettings *settings,
         QWidget *parent = nullptr,
-        Layouting::LayoutItems additionalItems = {});
+        Layouting::LayoutModifier additionalItems = {});
 
     ~BaseSettingsWidget() override = default;
 
diff --git a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
index 202cce6a626..44fd187a729 100644
--- a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
+++ b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
@@ -320,10 +320,10 @@ public:
             m_aspects->toMap(map);
     }
 
-    std::optional<Layouting::LayoutItem> settingsLayout()
+    Layouting::LayoutModifier settingsLayout()
     {
-        if (m_aspects && m_aspects->layouter())
-            return m_aspects->layouter()();
+        if (m_aspects)
+            return [this](Layouting::Layout *iface) { m_aspects->addToLayout(*iface); };
         return {};
     }
 
@@ -483,8 +483,7 @@ QWidget *LuaClientSettings::createSettingsWidget(QWidget *parent) const
     using namespace Layouting;
 
     if (auto w = m_wrapper.lock())
-        if (std::optional<LayoutItem> layout = w->settingsLayout())
-            return new BaseSettingsWidget(this, parent, layout->subItems);
+        return new BaseSettingsWidget(this, parent, w->settingsLayout());
 
     return new BaseSettingsWidget(this, parent);
 }
diff --git a/src/plugins/lua/bindings/inheritance.h b/src/plugins/lua/bindings/inheritance.h
index 6336ff4d2d6..066f2f02154 100644
--- a/src/plugins/lua/bindings/inheritance.h
+++ b/src/plugins/lua/bindings/inheritance.h
@@ -72,43 +72,47 @@ SOL_DERIVED_CLASSES(
     Utils::AspectList);
 
 namespace Layouting {
-class LayoutItem;
+class Object;
+
+class Layout;
 class Column;
-class Row;
 class Flow;
-class Grid;
 class Form;
+class Grid;
+
 class Widget;
-class Stack;
-class Tab;
 class Group;
-class TextEdit;
 class PushButton;
+class Row;
 class SpinBox;
 class Splitter;
-class ToolBar;
+class Stack;
+class Tab;
 class TabWidget;
-class Group;
+class TextEdit;
+class ToolBar;
 } // namespace Layouting
 
-SOL_BASE_CLASSES(Layouting::Column, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::Row, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::Flow, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::Grid, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::Form, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::Widget, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::Stack, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::Tab, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::Group, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::TextEdit, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::PushButton, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::SpinBox, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::Splitter, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::ToolBar, Layouting::LayoutItem);
-SOL_BASE_CLASSES(Layouting::TabWidget, Layouting::LayoutItem);
+SOL_BASE_CLASSES(Layouting::Layout, Layouting::Object);
+SOL_BASE_CLASSES(Layouting::Column, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Row, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Flow, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Grid, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Form, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Widget, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::Stack, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::Tab, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::Group, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::TextEdit, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::PushButton, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::SpinBox, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::Splitter, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::ToolBar, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::TabWidget, Layouting::Widget);
 
 SOL_DERIVED_CLASSES(
-    Layouting::LayoutItem,
+    Layouting::Object,
+    Layouting::Layout,
     Layouting::Column,
     Layouting::Row,
     Layouting::Flow,
@@ -124,3 +128,4 @@ SOL_DERIVED_CLASSES(
     Layouting::Splitter,
     Layouting::ToolBar,
     Layouting::TabWidget);
+
diff --git a/src/plugins/lua/bindings/layout.cpp b/src/plugins/lua/bindings/layout.cpp
index 6225bce9f33..4fca3ed7ef6 100644
--- a/src/plugins/lua/bindings/layout.cpp
+++ b/src/plugins/lua/bindings/layout.cpp
@@ -13,36 +13,164 @@ using namespace Utils;
 
 namespace Lua::Internal {
 
-static void processChildren(LayoutItem *item, const sol::table &children)
+template<class T>
+static void processChildren(T *item, const sol::table &children)
 {
     for (size_t i = 1; i <= children.size(); ++i) {
-        const sol::object v = children[i];
-
-        if (v.is<LayoutItem *>()) {
-            item->addItem(*v.as<LayoutItem *>());
-        } else if (v.is<BaseAspect>()) {
-            v.as<BaseAspect *>()->addToLayout(*item);
-        } else if (v.is<QString>()) {
-            item->addItem(v.as<QString>());
-        } else if (v.is<sol::function>()) {
-            const sol::function f = v.as<sol::function>();
-            auto res = LuaEngine::safe_call<LayoutItem *>(f);
+        const auto &child = children[i];
+        if (child.is<Layout *>()) {
+            item->addItem(*child.get<Layout *>());
+        } else if (child.is<Widget *>()) {
+            item->addItem(*child.get<Widget *>());
+        } else if (child.is<BaseAspect>()) {
+            child.get<BaseAspect *>()->addToLayout(*item);
+        } else if (child.is<QString>()) {
+            item->addItem(child.get<QString>());
+        } else if (child.is<sol::function>()) {
+            const sol::function f = child.get<sol::function>();
+            auto res = LuaEngine::void_safe_call(f, item);
             QTC_ASSERT_EXPECTED(res, continue);
-            item->addItem(**res);
+        } else if (child.is<Span>()) {
+            const Span &span = child.get<Span>();
+            item->addItem(span);
+        } else if (child.is<Space>()) {
+            const Space &space = child.get<Space>();
+            item->addItem(space);
+        } else if (child.is<Stretch>()) {
+            const Stretch &stretch = child.get<Stretch>();
+            item->addItem(stretch);
         } else {
-            qWarning() << "Incompatible object added to layout item: " << (int) v.get_type()
+            qWarning() << "Incompatible object added to layout item: " << (int) child.get_type()
                        << " (expected LayoutItem, Aspect or function returning LayoutItem)";
         }
     }
 }
 
-template<class T, typename... Args>
-static std::unique_ptr<T> construct(Args &&...args, const sol::table &children)
+template<class T>
+static std::unique_ptr<T> construct(const sol::table &children)
 {
-    std::unique_ptr<T> item(new T(std::forward<Args>(args)..., {}));
-
+    std::unique_ptr<T> item(new T({}));
     processChildren(item.get(), children);
+    return item;
+}
 
+template<class T>
+void constructWidget(std::unique_ptr<T> &widget, const sol::table &children)
+{
+    widget->setWindowTitle(children.get_or<QString>("windowTitle", ""));
+    widget->setToolTip(children.get_or<QString>("toolTip", ""));
+
+    for (size_t i = 1; i < children.size(); ++i) {
+        const auto &child = children[i];
+        if (child.is<Layout>())
+            widget->setLayout(*child.get<Layout *>());
+    }
+}
+
+#define HAS_MEM_FUNC(func, name) \
+    template<typename T, typename Sign> \
+    struct name \
+    { \
+        typedef char yes[1]; \
+        typedef char no[2]; \
+        template<typename U, U> \
+        struct type_check; \
+        template<typename _1> \
+        static yes &chk(type_check<Sign, &_1::func> *); \
+        template<typename> \
+        static no &chk(...); \
+        static bool const value = sizeof(chk<T>(0)) == sizeof(yes); \
+    }
+
+HAS_MEM_FUNC(onTextChanged, hasOnTextChanged);
+HAS_MEM_FUNC(onClicked, hasOnClicked);
+HAS_MEM_FUNC(setText, hasSetText);
+HAS_MEM_FUNC(setTitle, hasSetTitle);
+HAS_MEM_FUNC(setValue, hasSetValue);
+
+template<class T>
+void setProperties(std::unique_ptr<T> &item, const sol::table &children)
+{
+    if constexpr (hasOnTextChanged<T, void (T::*)(const QString &)>::value) {
+        sol::optional<sol::protected_function> onTextChanged
+            = children.get<sol::optional<sol::protected_function>>("onTextChanged");
+        if (onTextChanged) {
+            item->onTextChanged(
+                [f = *onTextChanged](const QString &text) {
+                    auto res = LuaEngine::void_safe_call(f, text);
+                    QTC_CHECK_EXPECTED(res);
+                },
+                &LuaEngine::instance());
+        }
+    }
+    if constexpr (hasOnClicked<T, void (T::*)(const std::function<void()> &, QObject *guard)>::value) {
+        sol::optional<sol::protected_function> onClicked
+            = children.get<sol::optional<sol::protected_function>>("onClicked");
+        if (onClicked) {
+            item->onClicked(
+                [f = *onClicked]() {
+                    auto res = LuaEngine::void_safe_call(f);
+                    QTC_CHECK_EXPECTED(res);
+                },
+                &LuaEngine::instance());
+        }
+    }
+    if constexpr (hasSetText<T, void (T::*)(const QString &)>::value) {
+        item->setText(children.get_or<QString>("text", ""));
+    }
+    if constexpr (hasSetTitle<T, void (T::*)(const QString &)>::value) {
+        item->setTitle(children.get_or<QString>("title", ""));
+    }
+    if constexpr (hasSetValue<T, void (T::*)(int)>::value) {
+        sol::optional<int> value = children.get<sol::optional<int>>("value");
+        if (value)
+            item->setValue(*value);
+    }
+}
+
+template<class T>
+std::unique_ptr<T> constructWidgetType(const sol::table &children)
+{
+    std::unique_ptr<T> item(new T({}));
+    constructWidget(item, children);
+    setProperties(item, children);
+    return item;
+}
+
+std::unique_ptr<Tab> constructTab(const QString &tabName, const Layout &layout)
+{
+    std::unique_ptr<Tab> item = std::make_unique<Tab>(tabName, layout);
+    return item;
+}
+
+std::unique_ptr<TabWidget> constructTabWidget(const sol::table &children)
+{
+    std::unique_ptr<TabWidget> item(new TabWidget({}));
+    setProperties(item, children);
+    for (size_t i = 1; i < children.size(); ++i) {
+        const auto &child = children[i];
+        if (child.is<Tab *>())
+            addToTabWidget(item.get(), *child.get<Tab *>());
+    }
+    return item;
+}
+
+std::unique_ptr<Splitter> constructSplitter(const sol::table &children)
+{
+    std::unique_ptr<Splitter> item(new Splitter({}));
+    constructWidget(item, children);
+
+    for (size_t i = 1; i < children.size(); ++i) {
+        const auto &child = children[i];
+        if (child.is<Layout *>()) {
+            addToSplitter(item.get(), *child.get<Layout *>());
+        } else if (child.is<Widget *>()) {
+            addToSplitter(item.get(), *child.get<Widget *>());
+        } else {
+            qWarning() << "Incompatible object added to Splitter: " << (int) child.get_type()
+                       << " (expected Layout or Widget)";
+        }
+    }
     return item;
 }
 
@@ -51,91 +179,119 @@ void addLayoutModule()
     LuaEngine::registerProvider("Layout", [](sol::state_view l) -> sol::object {
         sol::table layout = l.create_table();
 
-        layout.new_usertype<LayoutItem>("LayoutItem", "attachTo", &LayoutItem::attachTo);
+        layout.new_usertype<Span>(
+            "Span", sol::call_constructor, sol::constructors<Span(int n, const Layout::I &item)>());
 
-        layout["Span"] = [](int span, LayoutItem *item) {
-            return createItem(item, Span(span, *item));
-        };
-        layout["Space"] = [](int space) { return createItem(nullptr, Space(space)); };
-        layout["Stretch"] = [](int stretch) { return createItem(nullptr, Stretch(stretch)); };
+        layout.new_usertype<Space>("Space", sol::call_constructor, sol::constructors<Space(int)>());
+
+        layout.new_usertype<Stretch>(
+            "Stretch", sol::call_constructor, sol::constructors<Stretch(int)>());
+
+        // Layouts
+        layout.new_usertype<Form>(
+            "Form",
+            sol::call_constructor,
+            sol::factories(&construct<Form>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+
+        layout.new_usertype<Column>(
+            "Column",
+            sol::call_constructor,
+            sol::factories(&construct<Column>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+
+        layout.new_usertype<Row>(
+            "Row",
+            sol::call_constructor,
+            sol::factories(&construct<Row>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+        layout.new_usertype<Flow>(
+            "Flow",
+            sol::call_constructor,
+            sol::factories(&construct<Flow>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+        layout.new_usertype<Grid>(
+            "Grid",
+            sol::call_constructor,
+            sol::factories(&construct<Grid>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+
+        // Widgets
+        layout.new_usertype<PushButton>(
+            "PushButton",
+            sol::call_constructor,
+            sol::factories(&constructWidgetType<PushButton>),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        layout.new_usertype<Widget>(
+            "Widget",
+            sol::call_constructor,
+            sol::factories(&constructWidgetType<Widget>),
+            "show",
+            &Widget::show,
+            "resize",
+            &Widget::resize,
+            sol::base_classes,
+            sol::bases<Object, Thing>());
+
+        layout.new_usertype<Stack>(
+            "Stack",
+            sol::call_constructor,
+            sol::factories(&constructWidgetType<Stack>),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
 
-        layout.new_usertype<Column>("Column",
-                                    sol::call_constructor,
-                                    sol::factories(&construct<Column>),
-                                    sol::base_classes,
-                                    sol::bases<LayoutItem>());
-        layout.new_usertype<Row>("Row",
-                                 sol::call_constructor,
-                                 sol::factories(&construct<Row>),
-                                 sol::base_classes,
-                                 sol::bases<LayoutItem>());
-        layout.new_usertype<Flow>("Flow",
-                                  sol::call_constructor,
-                                  sol::factories(&construct<Flow>),
-                                  sol::base_classes,
-                                  sol::bases<LayoutItem>());
-        layout.new_usertype<Grid>("Grid",
-                                  sol::call_constructor,
-                                  sol::factories(&construct<Grid>),
-                                  sol::base_classes,
-                                  sol::bases<LayoutItem>());
-        layout.new_usertype<Form>("Form",
-                                  sol::call_constructor,
-                                  sol::factories(&construct<Form>),
-                                  sol::base_classes,
-                                  sol::bases<LayoutItem>());
-        layout.new_usertype<Widget>("Widget",
-                                    sol::call_constructor,
-                                    sol::factories(&construct<Widget>),
-                                    sol::base_classes,
-                                    sol::bases<LayoutItem>());
-        layout.new_usertype<Stack>("Stack",
-                                   sol::call_constructor,
-                                   sol::factories(&construct<Stack>),
-                                   sol::base_classes,
-                                   sol::bases<LayoutItem>());
         layout.new_usertype<Tab>(
             "Tab",
             sol::call_constructor,
-            sol::factories(&construct<Tab, QString>),
+            sol::factories(&constructTab),
             sol::base_classes,
-            sol::bases<LayoutItem>());
-        layout.new_usertype<TextEdit>("TextEdit",
-                                      sol::call_constructor,
-                                      sol::factories(&construct<TextEdit>),
-                                      sol::base_classes,
-                                      sol::bases<LayoutItem>());
-        layout.new_usertype<PushButton>("PushButton",
-                                        sol::call_constructor,
-                                        sol::factories(&construct<PushButton>),
-                                        sol::base_classes,
-                                        sol::bases<LayoutItem>());
-        layout.new_usertype<SpinBox>("SpinBox",
-                                     sol::call_constructor,
-                                     sol::factories(&construct<SpinBox>),
-                                     sol::base_classes,
-                                     sol::bases<LayoutItem>());
-        layout.new_usertype<Splitter>("Splitter",
-                                      sol::call_constructor,
-                                      sol::factories(&construct<Splitter>),
-                                      sol::base_classes,
-                                      sol::bases<LayoutItem>());
-        layout.new_usertype<ToolBar>("ToolBar",
-                                     sol::call_constructor,
-                                     sol::factories(&construct<ToolBar>),
-                                     sol::base_classes,
-                                     sol::bases<LayoutItem>());
-        layout.new_usertype<TabWidget>("TabWidget",
-                                       sol::call_constructor,
-                                       sol::factories(&construct<TabWidget>),
-                                       sol::base_classes,
-                                       sol::bases<LayoutItem>());
+            sol::bases<Widget, Object, Thing>());
 
-        layout.new_usertype<Group>("Group",
-                                   sol::call_constructor,
-                                   sol::factories(&construct<Group>),
-                                   sol::base_classes,
-                                   sol::bases<LayoutItem>());
+        layout.new_usertype<TextEdit>(
+            "TextEdit",
+            sol::call_constructor,
+            sol::factories(&constructWidgetType<TextEdit>),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        layout.new_usertype<SpinBox>(
+            "SpinBox",
+            sol::call_constructor,
+            sol::factories(&constructWidgetType<SpinBox>),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+        layout.new_usertype<Splitter>(
+            "Splitter",
+            sol::call_constructor,
+            sol::factories(&constructSplitter),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+        layout.new_usertype<ToolBar>(
+            "ToolBar",
+            sol::call_constructor,
+            sol::factories(&constructWidgetType<ToolBar>),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+        layout.new_usertype<TabWidget>(
+            "TabWidget",
+            sol::call_constructor,
+            sol::factories(&constructTabWidget),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        layout.new_usertype<Group>(
+            "Group",
+            sol::call_constructor,
+            sol::factories(&constructWidgetType<Group>),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
 
         layout["br"] = &br;
         layout["st"] = &st;
@@ -143,26 +299,16 @@ void addLayoutModule()
         layout["hr"] = &hr;
         layout["noMargin"] = &noMargin;
         layout["normalMargin"] = &normalMargin;
-        layout["customMargin"] = [](int left, int top, int right, int bottom) {
-            return customMargin(QMargins(left, top, right, bottom));
-        };
-        layout["withFormAlignment"] = &withFormAlignment;
-        layout["title"] = &title;
-        layout["text"] = &text;
-        layout["tooltip"] = &tooltip;
-        layout["resize"] = &resize;
-        layout["columnStretch"] = &columnStretch;
-        layout["spacing"] = &spacing;
-        layout["windowTitle"] = &windowTitle;
-        layout["fieldGrowthPolicy"] = &fieldGrowthPolicy;
-        layout["id"] = &id;
-        layout["setText"] = &setText;
-        layout["onClicked"] = [](const sol::function &f) {
-            return onClicked([f]() {
-                auto res = LuaEngine::void_safe_call(f);
-                QTC_CHECK_EXPECTED(res);
-            });
-        };
+
+        //layout["customMargin"] = [](int left, int top, int right, int bottom) {
+        //    return customMargin(QMargins(left, top, right, bottom));
+        //};
+        // layout["withFormAlignment"] = &withFormAlignment;
+        // layout["columnStretch"] = &columnStretch;
+        // layout["spacing"] = &spacing;
+        // layout["windowTitle"] = &windowTitle;
+        // layout["fieldGrowthPolicy"] = &fieldGrowthPolicy;
+        // layout["id"] = &id;
         layout["onTextChanged"] = [](const sol::function &f) {
             return onTextChanged([f](const QString &text) {
                 auto res = LuaEngine::void_safe_call(f, text);
diff --git a/src/plugins/lua/bindings/settings.cpp b/src/plugins/lua/bindings/settings.cpp
index b1c388605fc..a023cd5a557 100644
--- a/src/plugins/lua/bindings/settings.cpp
+++ b/src/plugins/lua/bindings/settings.cpp
@@ -62,8 +62,8 @@ std::unique_ptr<LuaAspectContainer> aspectContainerCreate(const sol::table &opti
             } else if (key == "layouter") {
                 if (v.is<sol::function>())
                     container->setLayouter(
-                        [func = v.as<sol::function>()]() -> Layouting::LayoutItem {
-                            auto res = Lua::LuaEngine::safe_call<Layouting::LayoutItem>(func);
+                        [func = v.as<sol::function>()]() -> Layouting::Layout {
+                            auto res = Lua::LuaEngine::safe_call<Layouting::Layout>(func);
                             QTC_ASSERT_EXPECTED(res, return {});
                             return *res;
                         });
diff --git a/src/plugins/lualsp/lualsp/init.lua b/src/plugins/lualsp/lualsp/init.lua
index ea7501bebb7..187aadb50e1 100644
--- a/src/plugins/lualsp/lualsp/init.lua
+++ b/src/plugins/lualsp/lualsp/init.lua
@@ -145,9 +145,8 @@ local function layoutSettings()
       "Language server not found:",
       Row {
         PushButton {
-          text("Try to install lua language server"),
-          onClicked(function() a.sync(installOrUpdateServer)() end),
-          br,
+          text = "Try to install lua language server",
+          onClicked = function() a.sync(installServer)() end,
         },
         st
       }
diff --git a/src/plugins/mcusupport/mcukitaspect.cpp b/src/plugins/mcusupport/mcukitaspect.cpp
index 44823bd45df..1ab803b2437 100644
--- a/src/plugins/mcusupport/mcukitaspect.cpp
+++ b/src/plugins/mcusupport/mcukitaspect.cpp
@@ -24,7 +24,7 @@ public:
 
     void makeReadOnly() override {}
     void refresh() override {}
-    void addToLayoutImpl(Layouting::LayoutItem &) override {}
+    void addToLayoutImpl(Layouting::Layout &) override {}
 };
 
 Utils::Id McuDependenciesKitAspect::id()
diff --git a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
index c936ac3130d..090f48257f9 100644
--- a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
@@ -191,7 +191,7 @@ public:
         Column {
             noMargin,
             Form {
-                 Tr::tr("Parameters:"), parametersLineEdit, br,
+                Tr::tr("Parameters:"), parametersLineEdit, br,
                 buildCfg->buildDirectoryAspect(), br
             },
             optionsFilterLineEdit,
diff --git a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
index 252e351ff71..0847199d23e 100644
--- a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
+++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
@@ -36,7 +36,7 @@ private:
 
     void makeReadOnly() override { m_toolsComboBox->setEnabled(false); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_toolsComboBox);
         parent.addItem(m_toolsComboBox);
diff --git a/src/plugins/nim/settings/nimsettings.cpp b/src/plugins/nim/settings/nimsettings.cpp
index 9df9acd73bf..ce5f406f5be 100644
--- a/src/plugins/nim/settings/nimsettings.cpp
+++ b/src/plugins/nim/settings/nimsettings.cpp
@@ -30,7 +30,7 @@ NimSettings::NimSettings()
         using namespace Layouting;
         return Column {
             Group {
-                title("Nimsuggest"),
+                title(QString("Nimsuggest")),
                 Column { nimSuggestPath }
             },
             st
diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp
index 6f7691c054f..65b00a19dc4 100644
--- a/src/plugins/perforce/perforcesettings.cpp
+++ b/src/plugins/perforce/perforcesettings.cpp
@@ -125,7 +125,7 @@ PerforceSettings::PerforceSettings()
 
         Group environment {
             title(Tr::tr("Environment Variables")),
-            customEnv.groupChecker(),
+            groupChecker(customEnv.groupChecker()),
             Row { p4Port, p4Client, p4User }
         };
 
diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp
index 969f0b09bc4..82c38c92bc8 100644
--- a/src/plugins/projectexplorer/buildaspects.cpp
+++ b/src/plugins/projectexplorer/buildaspects.cpp
@@ -123,7 +123,7 @@ void BuildDirectoryAspect::fromMap(const Store &map)
     }
 }
 
-void BuildDirectoryAspect::addToLayout(Layouting::LayoutItem &parent)
+void BuildDirectoryAspect::addToLayout(Layouting::Layout &parent)
 {
     FilePathAspect::addToLayout(parent);
     d->genericProblemSpacer = new QLabel;
diff --git a/src/plugins/projectexplorer/buildaspects.h b/src/plugins/projectexplorer/buildaspects.h
index f19cc393858..73d02b193d2 100644
--- a/src/plugins/projectexplorer/buildaspects.h
+++ b/src/plugins/projectexplorer/buildaspects.h
@@ -23,7 +23,7 @@ public:
     bool isShadowBuild() const;
     void setProblem(const QString &description);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     static Utils::FilePath fixupDir(const Utils::FilePath &dir);
 
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index dd1e077af49..6b60b659215 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -326,13 +326,13 @@ NamedWidget *BuildConfiguration::createConfigWidget()
     }
 
     Layouting::Form form;
+    form.noMargin();
     for (BaseAspect *aspect : aspects()) {
         if (aspect->isVisible()) {
             form.addItem(aspect);
-            form.addItem(Layouting::br);
+            form.flush();
         }
     }
-    form.addItem(Layouting::noMargin);
     form.attachTo(widget);
 
     return named;
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 70c58eedeec..9b28cd08b23 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -113,11 +113,13 @@ QWidget *BuildStep::doCreateConfigWidget()
 QWidget *BuildStep::createConfigWidget()
 {
     Layouting::Form form;
+    form.noMargin();
     for (BaseAspect *aspect : std::as_const(*this)) {
-        if (aspect->isVisible())
-            form.addItems({aspect, Layouting::br()});
+        if (aspect->isVisible()) {
+            form.addItem(aspect);
+            form.flush();
+        }
     }
-    form.addItem(Layouting::noMargin);
     auto widget = form.emerge();
 
     if (m_addMacroExpander)
diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
index 0153a6a1958..67e1f4820be 100644
--- a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
@@ -19,6 +19,7 @@
 
 #include <QComboBox>
 #include <QLabel>
+#include <QLayout>
 #include <QStackedWidget>
 
 using namespace TextEditor;
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
index f1e520c4c66..59ead38b9f3 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
@@ -23,6 +23,7 @@
 #include <utils/qtcassert.h>
 
 #include <QComboBox>
+#include <QFormLayout>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
@@ -91,7 +92,7 @@ private:
     QPushButton *m_defaultDeviceButton;
     QVBoxLayout *m_buttonsLayout;
     QWidget *m_deviceNameEditWidget;
-    QFormLayout *m_generalFormLayout;
+    QLayout *m_generalFormLayout;
 };
 
 DeviceSettingsWidget::DeviceSettingsWidget()
@@ -338,7 +339,7 @@ void DeviceSettingsWidget::currentDeviceChanged(int index)
         return;
     }
 
-    Layouting::Column item{Layouting::noMargin()};
+    Layouting::Column item{Layouting::noMargin};
     device->settings()->displayName.addToLayout(item);
     QWidget *newEdit = item.emerge();
     QLayoutItem *oldItem = m_generalFormLayout->replaceWidget(m_deviceNameEditWidget, newEdit);
diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp
index a91ef0cf689..db3300f3270 100644
--- a/src/plugins/projectexplorer/kitaspects.cpp
+++ b/src/plugins/projectexplorer/kitaspects.cpp
@@ -61,7 +61,7 @@ public:
 private:
     void makeReadOnly() override { m_chooser->setReadOnly(true); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_chooser);
         builder.addItem(Layouting::Span(2, m_chooser));
@@ -238,7 +238,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_mainWidget);
         builder.addItem(m_mainWidget);
@@ -739,7 +739,7 @@ public:
     ~DeviceTypeKitAspectImpl() override { delete m_comboBox; }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_comboBox);
         builder.addItem(m_comboBox);
@@ -889,7 +889,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_comboBox);
         builder.addItem(m_comboBox);
@@ -1170,7 +1170,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_comboBox);
         builder.addItem(m_comboBox);
@@ -1433,7 +1433,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_mainWidget);
         builder.addItem(m_mainWidget);
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 9406d746d91..154ce46f4bc 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -798,7 +798,7 @@ void KitAspect::makeStickySubWidgetsReadOnly()
     makeReadOnly();
 }
 
-void KitAspect::addToLayout(Layouting::LayoutItem &parentItem)
+void KitAspect::addToLayout(Layouting::Layout &parentItem)
 {
     auto label = createSubWidget<QLabel>(m_factory->displayName() + ':');
     label->setToolTip(m_factory->description());
diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h
index 44c6223d79b..4068aea15d5 100644
--- a/src/plugins/projectexplorer/kitmanager.h
+++ b/src/plugins/projectexplorer/kitmanager.h
@@ -110,7 +110,7 @@ public:
 
     virtual void refresh() = 0;
 
-    void addToLayout(Layouting::LayoutItem &parentItem) override;
+    void addToLayout(Layouting::Layout &parentItem) override;
 
     static QString msgManage();
 
@@ -124,7 +124,7 @@ public:
 
 protected:
     virtual void makeReadOnly() {}
-    virtual void addToLayoutImpl(Layouting::LayoutItem &parentItem) = 0;
+    virtual void addToLayoutImpl(Layouting::Layout &parentItem) = 0;
     virtual Utils::Id settingsPageItemToPreselect() const { return {}; }
 
     Kit *m_kit;
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
index 2c142dec886..ab884a9d7fc 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
@@ -200,7 +200,7 @@ QString KitManagerConfigWidget::validityMessage() const
     return m_modifiedKit->toHtml(tmp);
 }
 
-void KitManagerConfigWidget::addAspectToWorkingCopy(Layouting::LayoutItem &parent, KitAspectFactory *factory)
+void KitManagerConfigWidget::addAspectToWorkingCopy(Layouting::Layout &parent, KitAspectFactory *factory)
 {
     QTC_ASSERT(factory, return);
     KitAspect *aspect = factory->createKitAspect(workingCopy());
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.h b/src/plugins/projectexplorer/kitmanagerconfigwidget.h
index 1a499f7dabf..8564ccbcc90 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.h
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.h
@@ -36,7 +36,7 @@ public:
     void discard();
     bool isDirty() const;
     QString validityMessage() const;
-    void addAspectToWorkingCopy(Layouting::LayoutItem &parent, KitAspectFactory *factory);
+    void addAspectToWorkingCopy(Layouting::Layout &parent, KitAspectFactory *factory);
     void makeStickySubWidgetsReadOnly();
 
     Kit *workingCopy() const;
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index 730215d81c8..16e6f2c4e72 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -313,7 +313,7 @@ QWidget *MakeStep::createConfigWidget()
     if (m_disablingForSubDirsSupported)
         builder.addRow({m_disabledForSubdirsAspect});
     builder.addRow({m_buildTargetsAspect});
-    builder.addItem(Layouting::noMargin);
+    builder.noMargin();
 
     auto widget = builder.emerge();
 
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index bbf2b8be1dd..a9544fc8c8e 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -552,7 +552,7 @@ int SelectorView::padding()
 /////////
 // KitAreaWidget
 /////////
-void doLayout(KitAspect *aspect, Layouting::LayoutItem &builder)
+void doLayout(KitAspect *aspect, Layouting::Layout &builder)
 {
     aspect->addToLayout(builder);
 }
@@ -586,7 +586,8 @@ public:
             if (k && k->isMutable(factory->id())) {
                 KitAspect *aspect = factory->createKitAspect(k);
                 m_kitAspects << aspect;
-                grid.addItems({aspect, Layouting::br});
+                grid.addItem(aspect);
+                grid.flush();
             }
         }
         m_gridWidget = grid.emerge();
diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp
index 8d97d1ca8ac..d7a1fcac18e 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepage.cpp
@@ -789,7 +789,7 @@ public:
 
         auto sessions = new QWidget;
         {
-            auto sessionsLabel = new Label(Tr::tr("Sessions"), Label::Primary);
+            auto sessionsLabel = new Core::Label(Tr::tr("Sessions"), Core::Label::Primary);
             auto manageSessionsButton = new Button(Tr::tr("Manage..."), Button::MediumSecondary);
             auto sessionsList = new TreeView(this, "Sessions");
             sessionsList->setModel(projectWelcomePage->m_sessionModel);
@@ -816,7 +816,7 @@ public:
 
         auto projects = new QWidget;
         {
-            auto projectsLabel = new Label(Tr::tr("Projects"), Label::Primary);
+            auto projectsLabel = new Core::Label(Tr::tr("Projects"), Core::Label::Primary);
             auto projectsList = new TreeView(this, "Recent Projects");
             projectsList->setUniformRowHeights(true);
             projectsList->setModel(projectWelcomePage->m_projectModel);
@@ -840,7 +840,7 @@ public:
             sessions,
             projects,
             spacing(0),
-            noMargin(),
+            noMargin,
         }.attachTo(this);
     }
 
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index be59ad0eaa6..3aa2457ef95 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -201,13 +201,13 @@ bool RunConfiguration::isEnabled(Utils::Id) const
 QWidget *RunConfiguration::createConfigurationWidget()
 {
     Layouting::Form form;
+    form.noMargin();
     for (BaseAspect *aspect : std::as_const(*this)) {
         if (aspect->isVisible()) {
             form.addItem(aspect);
-            form.addItem(Layouting::br);
+            form.flush();
         }
     }
-    form.addItem(Layouting::noMargin);
     auto widget = form.emerge();
 
     VariableChooser::addSupportForChildWidgets(widget, &m_expander);
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index 6a580f5f4ba..80e82b9f826 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -63,13 +63,13 @@ TerminalAspect::TerminalAspect(AspectContainer *container)
 /*!
     \reimp
 */
-void TerminalAspect::addToLayout(LayoutItem &parent)
+void TerminalAspect::addToLayout(Layout &parent)
 {
     QTC_CHECK(!m_checkBox);
     m_checkBox = createSubWidget<QCheckBox>(Tr::tr("Run in terminal"));
     m_checkBox->setChecked(m_useTerminal);
     m_checkBox->setEnabled(isEnabled());
-    parent.addItems({empty(), m_checkBox.data()});
+    parent.addItems({empty, m_checkBox.data()});
     connect(m_checkBox.data(), &QAbstractButton::clicked, this, [this] {
         m_userSet = true;
         m_useTerminal = m_checkBox->isChecked();
@@ -174,7 +174,7 @@ void WorkingDirectoryAspect::setEnvironment(EnvironmentAspect *envAspect)
 /*!
     \reimp
 */
-void WorkingDirectoryAspect::addToLayout(LayoutItem &builder)
+void WorkingDirectoryAspect::addToLayout(Layout &builder)
 {
     QTC_CHECK(!m_chooser);
     m_chooser = new PathChooser;
@@ -451,7 +451,7 @@ QWidget *ArgumentsAspect::setupChooser()
 /*!
     \reimp
 */
-void ArgumentsAspect::addToLayout(LayoutItem &builder)
+void ArgumentsAspect::addToLayout(Layout &builder)
 {
     QTC_CHECK(!m_chooser && !m_multiLineChooser && !m_multiLineButton);
 
@@ -643,11 +643,13 @@ FilePath ExecutableAspect::executable() const
 /*!
     \reimp
 */
-void ExecutableAspect::addToLayout(LayoutItem &builder)
+void ExecutableAspect::addToLayout(Layout &builder)
 {
     builder.addItem(m_executable);
-    if (m_alternativeExecutable)
-        builder.addItems({br, m_alternativeExecutable});
+    if (m_alternativeExecutable) {
+        builder.flush();
+        builder.addItem(m_alternativeExecutable);
+    }
 }
 
 /*!
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h
index d02236a6598..d891132ea7d 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -29,7 +29,7 @@ class PROJECTEXPLORER_EXPORT TerminalAspect : public Utils::BaseAspect
 public:
     explicit TerminalAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     bool useTerminal() const;
     void setUseTerminalHint(bool useTerminal);
@@ -61,7 +61,7 @@ class PROJECTEXPLORER_EXPORT WorkingDirectoryAspect : public Utils::BaseAspect
 public:
     explicit WorkingDirectoryAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     Utils::FilePath operator()() const { return workingDirectory(); }
     Utils::FilePath workingDirectory() const;
@@ -93,7 +93,7 @@ class PROJECTEXPLORER_EXPORT ArgumentsAspect : public Utils::BaseAspect
 public:
     explicit ArgumentsAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     QString operator()() const { return arguments(); }
     QString arguments() const;
@@ -171,7 +171,7 @@ public:
     void setDeviceSelector(Target *target, ExecutionDeviceSelector selector);
     void setSettingsKey(const Utils::Key &key);
     void makeOverridable(const Utils::Key &overridingKey, const Utils::Key &useOverridableKey);
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     void setLabelText(const QString &labelText);
     void setPlaceHolderText(const QString &placeHolderText);
     void setHistoryCompleter(const Utils::Key &historyCompleterKey);
diff --git a/src/plugins/python/pythonkitaspect.cpp b/src/plugins/python/pythonkitaspect.cpp
index 0be12cead0a..1b0004fd78b 100644
--- a/src/plugins/python/pythonkitaspect.cpp
+++ b/src/plugins/python/pythonkitaspect.cpp
@@ -73,7 +73,7 @@ public:
     }
 
 protected:
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_comboBox);
         parent.addItem(m_comboBox);
diff --git a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
index 78e0634bc5f..ad8c5d79950 100644
--- a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
+++ b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
@@ -50,7 +50,7 @@ CustomQbsPropertiesDialog::CustomQbsPropertiesDialog(const QVariantMap &properti
             Column {
                 PushButton {
                     text(Tr::tr("&Add")),
-                    onClicked([this] { addProperty(); } ),
+                    onClicked([this] { addProperty(); }, nullptr),
                 },
                 m_removeButton,
                 st
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 71cc48aaf8b..9d0a9f642cf 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -60,7 +60,7 @@ ArchitecturesAspect::ArchitecturesAspect(AspectContainer *container)
     setAllValues(m_abisToArchMap.keys());
 }
 
-void ArchitecturesAspect::addToLayout(Layouting::LayoutItem &parent)
+void ArchitecturesAspect::addToLayout(Layouting::Layout &parent)
 {
     MultiSelectionAspect::addToLayout(parent);
     const auto changeHandler = [this] {
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
index 4815a96a857..37ed2181878 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -20,7 +20,7 @@ public:
     ArchitecturesAspect(Utils::AspectContainer *container = nullptr);
 
     void setKit(const ProjectExplorer::Kit *kit) { m_kit = kit; }
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     QStringList selectedArchitectures() const;
     void setSelectedArchitectures(const QStringList& architectures);
     bool isManagedByTarget() const { return m_isManagedByTarget; }
diff --git a/src/plugins/qbsprojectmanager/qbskitaspect.cpp b/src/plugins/qbsprojectmanager/qbskitaspect.cpp
index 647f44f02c7..adc35c2f3f9 100644
--- a/src/plugins/qbsprojectmanager/qbskitaspect.cpp
+++ b/src/plugins/qbsprojectmanager/qbskitaspect.cpp
@@ -34,7 +34,7 @@ private:
     void makeReadOnly() override { m_changeButton->setEnabled(false); }
     void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_contentLabel);
         parent.addItem(m_contentLabel);
diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
index fb048f94751..9b25c17d341 100644
--- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
@@ -133,11 +133,11 @@ QbsProfilesSettingsWidget::QbsProfilesSettingsWidget()
             Column {
                 PushButton {
                     text(Tr::tr("E&xpand All")),
-                    onClicked([this] { m_propertiesView->expandAll(); }),
+                    onClicked([this] { m_propertiesView->expandAll(); }, nullptr),
                 },
                 PushButton {
                     text(Tr::tr("&Collapse All")),
-                    onClicked([this] { m_propertiesView->collapseAll(); }),
+                    onClicked([this] { m_propertiesView->collapseAll(); }, nullptr),
                 },
                 st,
             },
diff --git a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp
index d8e1e416483..c29c8da43b5 100644
--- a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp
@@ -39,7 +39,7 @@ public:
     ~QmakeKitAspectImpl() override { delete m_lineEdit; }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_lineEdit);
         parent.addItem(m_lineEdit);
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 19e5d49b51d..d1de44d1f57 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -428,7 +428,7 @@ QWidget *QMakeStep::createConfigWidget()
     builder.addRow({userArguments});
     builder.addRow({effectiveCall});
     builder.addRow({abisLabel, abisListWidget});
-    builder.addItem(Layouting::noMargin);
+    builder.noMargin();
     auto widget = builder.emerge();
 
     qmakeBuildConfigChanged();
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
index a4509c38a67..cee25240cfc 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
@@ -143,7 +143,7 @@ AssetExportDialog::AssetExportDialog(const FilePath &exportPath,
         m_exportAssetsCheck,
         m_perComponentExportCheck,
         st,
-        noMargin(),
+        noMargin,
     }.attachTo(optionsWidget);
 
     Column {
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
index e65c05c39fe..56e22dab1b9 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
@@ -97,10 +97,10 @@ TimelineAnimationForm::TimelineAnimationForm(QWidget *parent)
     using namespace Layouting;
     Grid {
         Span(4, mainL), br,
-        empty(), br,
+        empty, br,
         idL, Span(2, m_idLineEdit), Span(2, Row{ runningL, m_running }), br,
-        empty(), startFrameL, m_startFrame, endFrameL, m_endFrame, durationL, m_duration, br,
-        empty(), continuousL, m_continuous, loopsL, m_loops, pingPongL, m_pingPong, str, br,
+        empty, startFrameL, m_startFrame, endFrameL, m_endFrame, durationL, m_duration, br,
+        empty, continuousL, m_continuous, loopsL, m_loops, pingPongL, m_pingPong, str, br,
         tr("Transition to state:"), transitionToStateL, m_transitionToState, br,
     }.attachTo(this);
 
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
index 08915b65771..2d1e70cd770 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
@@ -78,8 +78,8 @@ TimelineForm::TimelineForm(QWidget *parent)
     Grid {
         Span(2, mainL), br,
         idL, m_idLineEdit, br,
-        empty(), Row { startFrameL, m_startFrame, st(), endFrameL, m_endFrame }, str, br,
-        empty(), Row { m_expressionBinding, m_animation, st() }, br,
+        empty, Row { startFrameL, m_startFrame, st, endFrameL, m_endFrame }, str, br,
+        empty, Row { m_expressionBinding, m_animation, st }, br,
         expressionBindingL, m_expressionBindingLineEdit, br,
     }.attachTo(this);
 
diff --git a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
index f12d1ea57ae..facf33be474 100644
--- a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
+++ b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
@@ -21,6 +21,7 @@
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenu>
diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
index 7a35d9f15e2..983b7126336 100644
--- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
@@ -56,7 +56,7 @@ QmlMainFileAspect::~QmlMainFileAspect()
     delete m_fileListCombo;
 }
 
-void QmlMainFileAspect::addToLayout(Layouting::LayoutItem &parent)
+void QmlMainFileAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_ASSERT(!m_fileListCombo, delete m_fileListCombo);
     m_fileListCombo = new QComboBox;
diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
index 4a64055b6c4..fd875dde79c 100644
--- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
+++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
@@ -42,7 +42,7 @@ public:
         Utils::FilePath currentFile;
     };
 
-    void addToLayout(Layouting::LayoutItem &parent) final;
+    void addToLayout(Layouting::Layout &parent) final;
     void toMap(Utils::Store &map) const final;
     void fromMap(const Utils::Store &map) final;
 
diff --git a/src/plugins/qtsupport/qtbuildaspects.cpp b/src/plugins/qtsupport/qtbuildaspects.cpp
index 2f6ee192206..2f7d966ba6f 100644
--- a/src/plugins/qtsupport/qtbuildaspects.cpp
+++ b/src/plugins/qtsupport/qtbuildaspects.cpp
@@ -30,12 +30,12 @@ QmlDebuggingAspect::QmlDebuggingAspect(AspectContainer *container)
     setValue(buildPropertiesSettings().qmlDebugging());
 }
 
-void QmlDebuggingAspect::addToLayout(Layouting::LayoutItem &parent)
+void QmlDebuggingAspect::addToLayout(Layouting::Layout &parent)
 {
     SelectionAspect::addToLayout(parent);
     const auto warningLabel = createSubWidget<InfoLabel>(QString(), InfoLabel::Warning);
     warningLabel->setElideMode(Qt::ElideNone);
-    parent.addRow({{}, warningLabel});
+    parent.addRow({Layouting::empty, warningLabel});
     const auto changeHandler = [this, warningLabel] {
         QString warningText;
         QTC_ASSERT(m_buildConfig, return);
@@ -78,13 +78,13 @@ void QtQuickCompilerAspect::setBuildConfiguration(const BuildConfiguration *buil
     m_buildConfig = buildConfig;
 }
 
-void QtQuickCompilerAspect::addToLayout(Layouting::LayoutItem &parent)
+void QtQuickCompilerAspect::addToLayout(Layouting::Layout &parent)
 {
     SelectionAspect::addToLayout(parent);
     const auto warningLabel = createSubWidget<InfoLabel>(QString(), InfoLabel::Warning);
     warningLabel->setElideMode(Qt::ElideNone);
     warningLabel->setVisible(false);
-    parent.addRow({{}, warningLabel});
+    parent.addRow({Layouting::empty, warningLabel});
     const auto changeHandler = [this, warningLabel] {
         QString warningText;
         QTC_ASSERT(m_buildConfig, return);
diff --git a/src/plugins/qtsupport/qtbuildaspects.h b/src/plugins/qtsupport/qtbuildaspects.h
index 873daf000d2..e112e6a60bb 100644
--- a/src/plugins/qtsupport/qtbuildaspects.h
+++ b/src/plugins/qtsupport/qtbuildaspects.h
@@ -21,7 +21,7 @@ public:
     void setBuildConfiguration(const ProjectExplorer::BuildConfiguration *newBuildConfig);
 
 private:
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     const ProjectExplorer::BuildConfiguration *m_buildConfig = nullptr;
 };
@@ -36,7 +36,7 @@ public:
     void setBuildConfiguration(const ProjectExplorer::BuildConfiguration *newBuildConfig);
 
 private:
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     const ProjectExplorer::BuildConfiguration *m_buildConfig = nullptr;
 };
diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp
index 8059c1059a3..18a18b6ae45 100644
--- a/src/plugins/qtsupport/qtkitaspect.cpp
+++ b/src/plugins/qtsupport/qtkitaspect.cpp
@@ -62,7 +62,7 @@ public:
 private:
     void makeReadOnly() final { m_combo->setEnabled(false); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_combo);
         parent.addItem(m_combo);
diff --git a/src/plugins/remotelinux/sshdevicewizard.cpp b/src/plugins/remotelinux/sshdevicewizard.cpp
index d73e146957e..2cf001cd175 100644
--- a/src/plugins/remotelinux/sshdevicewizard.cpp
+++ b/src/plugins/remotelinux/sshdevicewizard.cpp
@@ -19,6 +19,7 @@
 #include <utils/utilsicons.h>
 
 #include <QLabel>
+#include <QLayout>
 #include <QPushButton>
 #include <QSpinBox>
 
diff --git a/src/plugins/screenrecorder/cropandtrim.cpp b/src/plugins/screenrecorder/cropandtrim.cpp
index b6da8f092ea..14f4c7fb4ad 100644
--- a/src/plugins/screenrecorder/cropandtrim.cpp
+++ b/src/plugins/screenrecorder/cropandtrim.cpp
@@ -324,7 +324,7 @@ CropWidget::CropWidget(QWidget *parent)
             saveImageButton,
             copyImageToClipboardButton,
         },
-        noMargin(),
+        noMargin,
     }.attachTo(this);
 
     connect(m_xSpinBox, &QSpinBox::valueChanged, this, &CropWidget::onSpinBoxChanged);
@@ -526,19 +526,19 @@ TrimWidget::TrimWidget(const ClipInfo &clip, QWidget *parent)
 
     using namespace Layouting;
     Column {
-        Row { m_frameSlider, m_currentTime, "/", m_clipDuration },
+        Row { m_frameSlider, m_currentTime, QString("/"), m_clipDuration },
         Group {
             title(Tr::tr("Trimming")),
             Row {
                 m_trimStart.button, m_trimStart.timeLabel,
                 Space(20),
                 m_trimEnd.button, m_trimEnd.timeLabel,
-                Stretch(), Space(20),
+                st, Space(20),
                 Tr::tr("Range:"), m_trimRange,
                 m_trimResetButton,
             },
         },
-        noMargin(),
+        noMargin,
     }.attachTo(this);
 
     connect(m_frameSlider, &QSlider::valueChanged, this, [this] {
@@ -652,7 +652,7 @@ CropAndTrimDialog::CropAndTrimDialog(const ClipInfo &clip, QWidget *parent)
     using namespace Layouting;
     Column {
         Group {
-            title("Cropping"),
+            title(Tr::tr("Cropping")),
             Column { m_cropWidget },
         },
         Space(16),
@@ -760,7 +760,7 @@ CropAndTrimWidget::CropAndTrimWidget(QWidget *parent)
     Row {
         m_button,
         m_cropSizeWarningIcon,
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
 
     connect(m_button, &QPushButton::clicked, this, [this] {
diff --git a/src/plugins/screenrecorder/export.cpp b/src/plugins/screenrecorder/export.cpp
index 15f38993adc..00daed94a88 100644
--- a/src/plugins/screenrecorder/export.cpp
+++ b/src/plugins/screenrecorder/export.cpp
@@ -144,7 +144,7 @@ ExportWidget::ExportWidget(QWidget *parent)
     exportButton->setText(Tr::tr("Export..."));
 
     using namespace Layouting;
-    Row { st, new StyledSeparator, exportButton, noMargin(), spacing(0) }.attachTo(this);
+    Row { st, new StyledSeparator, exportButton, noMargin, spacing(0) }.attachTo(this);
 
     connect(exportButton, &QToolButton::clicked, this, [this] {
         FilePathAspect &lastDir = Internal::settings().exportLastDirectory;
diff --git a/src/plugins/screenrecorder/record.cpp b/src/plugins/screenrecorder/record.cpp
index aba61ed2eba..70e1d5e2758 100644
--- a/src/plugins/screenrecorder/record.cpp
+++ b/src/plugins/screenrecorder/record.cpp
@@ -21,6 +21,7 @@
 #include <QAction>
 #include <QDialogButtonBox>
 #include <QGuiApplication>
+#include <QLayout>
 #include <QLoggingCategory>
 #include <QMessageBox>
 #include <QScreen>
@@ -224,7 +225,7 @@ RecordWidget::RecordWidget(const FilePath &recordFile, QWidget *parent)
         st,
         progressLabel,
         Space(6),
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
 
     connect(settingsButton, &QToolButton::clicked, this, [this] {
diff --git a/src/plugins/screenrecorder/screenrecorderplugin.cpp b/src/plugins/screenrecorder/screenrecorderplugin.cpp
index 9e42b2979f6..1aeb2ba1c44 100644
--- a/src/plugins/screenrecorder/screenrecorderplugin.cpp
+++ b/src/plugins/screenrecorder/screenrecorderplugin.cpp
@@ -29,6 +29,7 @@
 #include <coreplugin/icore.h>
 
 #include <QDialog>
+#include <QLayout>
 
 using namespace Utils;
 using namespace Core;
@@ -56,7 +57,7 @@ public:
         Column {
             m_recordWidget,
             Row { m_cropAndTrimStatusWidget, m_exportWidget },
-            noMargin(), spacing(0),
+            noMargin, spacing(0),
         }.attachTo(this);
 
         auto setLowerRowEndabled = [this] (bool enabled) {
diff --git a/src/plugins/scxmleditor/common/shapestoolbox.cpp b/src/plugins/scxmleditor/common/shapestoolbox.cpp
index 82def88379a..3fa15c562b7 100644
--- a/src/plugins/scxmleditor/common/shapestoolbox.cpp
+++ b/src/plugins/scxmleditor/common/shapestoolbox.cpp
@@ -33,7 +33,7 @@ ShapesToolbox::ShapesToolbox(QWidget *parent)
     Column {
         spacing(0),
         scrollArea,
-        noMargin,
+        noMargin
     }.attachTo(this);
 }
 
diff --git a/src/plugins/scxmleditor/common/stateview.cpp b/src/plugins/scxmleditor/common/stateview.cpp
index 517f53bd3ec..c31dd4f8507 100644
--- a/src/plugins/scxmleditor/common/stateview.cpp
+++ b/src/plugins/scxmleditor/common/stateview.cpp
@@ -33,7 +33,7 @@ StateView::StateView(StateItem *state, QWidget *parent)
 
     using namespace Layouting;
     Row {
-        PushButton{ text("Back"), onClicked([this] { closeView(); }, this) },
+        PushButton{ text(QString("Back")), onClicked([this] { closeView(); }, this) },
         stateNameLabel,
         noMargin
     }.attachTo(titleBar);
diff --git a/src/plugins/squish/squishsettings.cpp b/src/plugins/squish/squishsettings.cpp
index a8e0518a3de..1b8c799eda1 100644
--- a/src/plugins/squish/squishsettings.cpp
+++ b/src/plugins/squish/squishsettings.cpp
@@ -387,10 +387,10 @@ SquishServerSettingsWidget::SquishServerSettingsWidget(QWidget *parent)
     using namespace Layouting;
     Form grid {
         &m_applicationsView, br,
-        &m_serverSettings.autTimeout, br,
-        &m_serverSettings.responseTimeout, br,
-        &m_serverSettings.postMortemWaitTime, br,
-        &m_serverSettings.animatedCursor, br,
+        m_serverSettings.autTimeout, br,
+        m_serverSettings.responseTimeout, br,
+        m_serverSettings.postMortemWaitTime, br,
+        m_serverSettings.animatedCursor, br,
     };
     Column buttonCol {
         add,
diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp
index 284472938ff..1bea22072cc 100644
--- a/src/plugins/subversion/subversionsettings.cpp
+++ b/src/plugins/subversion/subversionsettings.cpp
@@ -76,7 +76,7 @@ SubversionSettings::SubversionSettings()
 
             Group {
                 title(Tr::tr("Authentication")),
-                useAuthentication.groupChecker(),
+                groupChecker(useAuthentication.groupChecker()),
                 Form {
                     userName, br,
                     password,
diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp
index b520f328921..47f45973747 100644
--- a/src/plugins/valgrind/valgrindsettings.cpp
+++ b/src/plugins/valgrind/valgrindsettings.cpp
@@ -116,7 +116,7 @@ SuppressionAspect::~SuppressionAspect()
     delete d;
 }
 
-void SuppressionAspect::addToLayout(Layouting::LayoutItem &parent)
+void SuppressionAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(!d->addEntry);
     QTC_CHECK(!d->removeEntry);
diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h
index 93866bae862..43a2b94592b 100644
--- a/src/plugins/valgrind/valgrindsettings.h
+++ b/src/plugins/valgrind/valgrindsettings.h
@@ -20,7 +20,7 @@ public:
     SuppressionAspect(Utils::AspectContainer *container, bool global);
     ~SuppressionAspect() final;
 
-    void addToLayout(Layouting::LayoutItem &parent) final;
+    void addToLayout(Layouting::Layout &parent) final;
 
     void fromMap(const Utils::Store &map) final;
     void toMap(Utils::Store &map) const final;
diff --git a/src/plugins/vcsbase/commonvcssettings.cpp b/src/plugins/vcsbase/commonvcssettings.cpp
index 6c6db16c3ef..1dbbb130dc5 100644
--- a/src/plugins/vcsbase/commonvcssettings.cpp
+++ b/src/plugins/vcsbase/commonvcssettings.cpp
@@ -92,9 +92,9 @@ CommonVcsSettings::CommonVcsSettings()
                 empty,
                 PushButton {
                     text(Tr::tr("Reset VCS Cache")),
-                    tooltip(Tr::tr("Reset information about which "
-                                   "version control system handles which directory.")),
-                    onClicked(&VcsManager::clearVersionControlCache)
+                    Layouting::toolTip(Tr::tr("Reset information about which "
+                                              "version control system handles which directory.")),
+                    onClicked(&VcsManager::clearVersionControlCache, (QObject *)nullptr)
                 }
             }
         };
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
index 1c8f6b60c1d..697808e70ea 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -131,7 +131,7 @@ public:
         addDataExtractor(this, &WebBrowserSelectionAspect::currentBrowser, &Data::currentBrowser);
     }
 
-    void addToLayout(Layouting::LayoutItem &parent) override
+    void addToLayout(Layouting::Layout &parent) override
     {
         QTC_CHECK(!m_webBrowserComboBox);
         m_webBrowserComboBox = new QComboBox;
diff --git a/src/plugins/webassembly/webassemblysettings.cpp b/src/plugins/webassembly/webassemblysettings.cpp
index d09919a05bb..74e4f65b842 100644
--- a/src/plugins/webassembly/webassemblysettings.cpp
+++ b/src/plugins/webassembly/webassemblysettings.cpp
@@ -21,6 +21,7 @@
 #include <utils/pathchooser.h>
 #include <utils/utilsicons.h>
 
+#include <QGroupBox>
 #include <QTextBrowser>
 #include <QTimer>
 
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 069fe1e2630..68e6d549f81 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -165,7 +165,7 @@ public:
                 customMargin({HPaddingM, VPaddingM, HPaddingM, VPaddingM}),
             },
             createRule(Qt::Horizontal),
-            noMargin(), spacing(0),
+            noMargin, spacing(0),
         }.attachTo(this);
     }
 };
@@ -194,7 +194,7 @@ public:
         m_essentials = new QWidget;
         Column essentials {
             spacing(0),
-            noMargin(),
+            noMargin,
         };
 
         {
@@ -232,7 +232,7 @@ public:
         mainColumn.addItem(st);
 
         {
-            auto label = new Label(Tr::tr("Explore more"), Label::Secondary);
+            auto label = new Core::Label(Tr::tr("Explore more"), Core::Label::Secondary);
             label->setContentsMargins(HPaddingXxs, 0, 0, 0); // Is indented in Figma design
 
             Column linksLayout {
@@ -275,7 +275,7 @@ public:
         Row {
             mainColumn,
             createRule(Qt::Vertical),
-            noMargin(), spacing(0),
+            noMargin, spacing(0),
         }.attachTo(mainWidget);
 
         setWidget(mainWidget);
@@ -342,7 +342,7 @@ WelcomeMode::WelcomeMode()
             m_sideArea,
             m_pageStack,
         },
-        noMargin(),
+        noMargin,
         spacing(0),
     }.attachTo(m_modeWidget);
 
diff --git a/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp b/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp
index 343c500c287..eda6a565b1d 100644
--- a/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp
+++ b/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp
@@ -24,9 +24,9 @@ int main(int argc, char *argv[])
     };
 
     Row {
-        PushButton { text("-"), onClicked(minusClick) },
+        PushButton { text("-"), onClicked(minusClick, nullptr) },
         lineEdit,
-        PushButton { text("+"), onClicked(plusClick) },
+        PushButton { text("+"), onClicked(plusClick, nullptr) },
         Group {
             title("Splitter in Group"),
             Column {
@@ -52,8 +52,8 @@ int main(int argc, char *argv[])
 
     Splitter {
         windowTitle("Splitter with sub layouts"),
-        Column {"First Widget"},
-        Row {"Second Widget"},
+        Column { QString("First Widget") },
+        Row { QString("Second Widget") },
     }.emerge()->show();
 
     return app.exec();
diff --git a/tests/manual/widgets/uifonts/tst_manual_widgets_uifonts.cpp b/tests/manual/widgets/uifonts/tst_manual_widgets_uifonts.cpp
index 4d324ec2652..247bba67728 100644
--- a/tests/manual/widgets/uifonts/tst_manual_widgets_uifonts.cpp
+++ b/tests/manual/widgets/uifonts/tst_manual_widgets_uifonts.cpp
@@ -67,18 +67,20 @@ int main(int argc, char *argv[])
     }
     html.append("</table></body></html>");
 
-    Column {
-        windowTitle("Utils::StyleHelper::uiFont"),
-        Group {
-            title("As QFont in QLabel"),
-            fontLabels,
-        },
-        Group {
-            title("As inline CSS in HTML elements"),
-            Row { html },
-        },
-        st,
-    }.emerge()->show();
+    Widget {
+        windowTitle(QString("Utils::StyleHelper::uiFont")),
+        Column {
+            Group {
+                title(QString("As QFont in QLabel")),
+                fontLabels,
+            },
+            Group {
+                title(QString("As inline CSS in HTML elements")),
+                Row { html },
+            },
+            st,
+        }
+    }.show();
 
     return app.exec();
 }