diff --git a/kcms/cellularnetwork/ui/SimLockPage.qml b/kcms/cellularnetwork/ui/SimLockPage.qml
index a67801b8..5f3a66fc 100644
--- a/kcms/cellularnetwork/ui/SimLockPage.qml
+++ b/kcms/cellularnetwork/ui/SimLockPage.qml
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Devin Lin <devin@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.12
+import QtQuick
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.12 as Controls
 
@@ -95,9 +95,9 @@ FormCard.FormCardPage {
     }
 
     data: [
-        RegExpValidator {
+        RegularExpressionValidator {
             id: pinValidator
-            regExp: /[0-9]+/
+            regularExpression: /[0-9]+/
         },
         // dialogs
 
diff --git a/kcms/cellularnetwork/ui/SimPage.qml b/kcms/cellularnetwork/ui/SimPage.qml
index 09ee9421..30be0663 100644
--- a/kcms/cellularnetwork/ui/SimPage.qml
+++ b/kcms/cellularnetwork/ui/SimPage.qml
@@ -53,6 +53,8 @@ FormCard.FormCardPage {
     }
 
     FormCard.FormCard {
+        Layout.topMargin: Kirigami.Units.gridUnit
+
         FormCard.FormSwitchDelegate {
             id: dataRoamingCheckBox
             text: i18n("Data Roaming")
@@ -91,7 +93,7 @@ FormCard.FormCardPage {
             icon.name: "unlock"
             text: i18n("SIM Lock")
             description: i18n("Modify SIM lock settings.")
-            enabled: simEnabled
+            // enabled: simEnabled
             onClicked: kcm.push("SimLockPage.qml", { "sim": sim });
         }
 
diff --git a/kcms/cellularnetwork/ui/main.qml b/kcms/cellularnetwork/ui/main.qml
index 4c15f5b3..5967b0f0 100644
--- a/kcms/cellularnetwork/ui/main.qml
+++ b/kcms/cellularnetwork/ui/main.qml
@@ -25,6 +25,23 @@ KCM.SimpleKCM {
     topPadding: 0
     bottomPadding: 0
 
+    PlasmaNM.Handler {
+        id: nmHandler
+    }
+
+    PlasmaNM.AvailableDevices {
+        id: availableDevices
+    }
+
+    PlasmaNM.EnabledConnections {
+        id: enabledConnections
+    }
+
+    SimPage {
+        id: simPage
+        visible: false
+    }
+
     Kirigami.PlaceholderMessage {
         id: noModem
         anchors.centerIn: parent
@@ -40,23 +57,6 @@ KCM.SimpleKCM {
         width: root.width
         visible: !noModem.visible
 
-        PlasmaNM.Handler {
-            id: nmHandler
-        }
-
-        PlasmaNM.AvailableDevices {
-            id: availableDevices
-        }
-
-        PlasmaNM.EnabledConnections {
-            id: enabledConnections
-        }
-
-        SimPage {
-            id: simPage
-            visible: false
-        }
-
         MessagesList {
             Layout.fillWidth: true
             Layout.margins: Kirigami.Units.largeSpacing
@@ -64,6 +64,8 @@ KCM.SimpleKCM {
         }
 
         FormCard.FormCard {
+            Layout.topMargin: Kirigami.Units.gridUnit
+
             FormCard.FormSwitchDelegate {
                 id: mobileDataSwitch
                 text: i18n("Mobile data")