diff --git a/GUI/Views/SampleDesigner/SampleToolBoxGroupView.cpp b/GUI/Views/SampleDesigner/SampleToolBoxGroupView.cpp
index d37cf01ea8872745c5792e657d73f566c83c407e..f7ff4a736dbadf10ababf56f86bfee27328ec87d 100644
--- a/GUI/Views/SampleDesigner/SampleToolBoxGroupView.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBoxGroupView.cpp
@@ -22,6 +22,10 @@ namespace {
 enum { FILTER_ROLE = Qt::UserRole + 11 };
 } // namespace
 
+//  ************************************************************************************************
+//  auxiliary class SampleToolBoxGroupModel
+//  ************************************************************************************************
+
 //! Represents a list of group entries. Uses a
 //! QAbstractListModel since the behaviour depends on the view mode of the list
 //! view, it does not return text in the case of IconMode.
@@ -38,7 +42,6 @@ public:
         QIcon icon;
     };
 
-
     // QAbstractListModel
     virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
@@ -75,12 +78,6 @@ void SampleToolBoxGroupModel::setViewMode(QListView::ViewMode viewMode)
         endResetModel();
 }
 
-void SampleToolBoxGroupView::addEntry(const QString& title, const QIcon& icon,
-                                      const QString& className, const QString& tooltip)
-{
-    m_model->addEntry(title, icon, className, tooltip);
-}
-
 QVariant SampleToolBoxGroupModel::data(const QModelIndex& index, int role) const
 {
     const int row = index.row();
@@ -153,7 +150,9 @@ SampleToolBoxGroupModel::Entry SampleToolBoxGroupModel::entryAt(int row) const
     return m_items.at(row);
 }
 
-// ----------------------  SampleToolBoxGroupView ----------------------------------------
+//  ************************************************************************************************
+//  class SampleToolBoxGroupView
+//  ************************************************************************************************
 
 SampleToolBoxGroupView::SampleToolBoxGroupView(QWidget* parent)
     : QListView(parent)
@@ -177,6 +176,12 @@ SampleToolBoxGroupView::SampleToolBoxGroupView(QWidget* parent)
     setModel(m_proxyModel);
 }
 
+void SampleToolBoxGroupView::addEntry(const QString& title, const QIcon& icon,
+                                      const QString& className, const QString& tooltip)
+{
+    m_model->addEntry(title, icon, className, tooltip);
+}
+
 void SampleToolBoxGroupView::setViewMode(ViewMode vm)
 {
     QListView::setViewMode(vm);
diff --git a/GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.cpp b/GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.cpp
index f988811b5c5bb1ffa7e11575ab664f52a1fafa4b..26ede5aeeb7161f9c556daf882d35e7dfff02606 100644
--- a/GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.cpp
@@ -106,6 +106,7 @@ private:
 
 } // namespace
 
+
 SampleToolBoxTreeWidget::SampleToolBoxTreeWidget(QWidget* parent)
     : QTreeWidget(parent), m_iconMode(false)
 {