diff --git a/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml
index 86bc68f7b3..9ee3cf5e5b 100644
--- a/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml
+++ b/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml
@@ -6,7 +6,7 @@ import QtQuick 2.15
 import QtQuick.Window 2.2
 import QtQuick.Controls 2.3
 
-import UM 1.2 as UM
+import UM 1.6 as UM
 import Cura 1.6 as Cura
 
 import DigitalFactory 1.0 as DF
@@ -66,13 +66,11 @@ Item
             anchors.margins: parent.border.width
 
             columnHeaders: ["Name", "Uploaded by", "Uploaded at"]
-//            model: TableModel
-//            {
-//                TableModelColumn { display: "fileName" }
-//                TableModelColumn { display: "username" }
-//                TableModelColumn { display: "uploadedAt" }
-//                rows: manager.digitalFactoryFileModel.items
-//            }
+            model: UM.TableModel
+            {
+                headers: ["fileName", "username", "uploadedAt"]
+                rows: manager.digitalFactoryFileModel.items
+            }
 
             onCurrentRowChanged:
             {
diff --git a/resources/qml/ProfileOverview.qml b/resources/qml/ProfileOverview.qml
index e1009cd010..b89933bb75 100644
--- a/resources/qml/ProfileOverview.qml
+++ b/resources/qml/ProfileOverview.qml
@@ -1,11 +1,11 @@
 //Copyright (c) 2022 Ultimaker B.V.
 //Cura is released under the terms of the LGPLv3 or higher.
 
-import Qt.labs.qmlmodels 1.0
+//import Qt.labs.qmlmodels 1.0
 import QtQuick 2.7
 import QtQuick.Controls 2.15
 
-import UM 1.5 as UM
+import UM 1.6 as UM
 import Cura 1.6 as Cura
 
 Cura.TableView
@@ -39,13 +39,11 @@ Cura.TableView
         catalog.i18nc("@title:column", "Current"),
         catalog.i18nc("@title:column Unit of measurement", "Unit")
     ]
-    model: TableModel
+
+    model: UM.TableModel
     {
         id: tableModel
-        TableModelColumn { display: "label" }
-        TableModelColumn { display: "profile_value" }
-        TableModelColumn { display: "user_value" }
-        TableModelColumn { display: "unit" }
+        headers: ["label", "profile_value", "user_value", "unit"]
         rows: modelRows
     }
     sectionRole: "category"
diff --git a/resources/qml/TableView.qml b/resources/qml/TableView.qml
index 885efe0765..6774db2bd6 100644
--- a/resources/qml/TableView.qml
+++ b/resources/qml/TableView.qml
@@ -56,8 +56,9 @@ Item
                     font: UM.Theme.getFont("medium_bold")
                     elide: Text.ElideRight
                 }
-                Item //Resize handle.
+                Item
                 {
+                    //Resize handle.
                     anchors
                     {
                         right: parent.right