diff --git a/docker/routlin-dash/app/pages/clientcredentials/content.json b/docker/routlin-dash/app/pages/clientcredentials/content.json
index cddc301..8b2492b 100644
--- a/docker/routlin-dash/app/pages/clientcredentials/content.json
+++ b/docker/routlin-dash/app/pages/clientcredentials/content.json
@@ -95,6 +95,40 @@
               "name": "enabled",
               "input_type": "checkbox"
             },
+            {
+              "type": "raw_html",
+              "html": "<script id=\"captive-vlan-data\" type=\"application/json\">%CAPTIVE_VLAN_OPTIONS%</script><script id=\"page-flags\" type=\"application/json\">{\"pro\": %PRO_LICENSE_JS%}</script>"
+            },
+            {
+              "type": "field",
+              "label": "User Type",
+              "name": "user_type",
+              "input_type": "select",
+              "options": [
+                {"value": "",  "label": "-- Select User Type --"},
+                {"value": "0", "label": "Captive Portal"},
+                {"value": "1", "label": "802.1X Supplicant"}
+              ]
+            },
+            {
+              "type": "raw_html",
+              "html": "<div id=\"vlan-row\">"
+            },
+            {
+              "type": "field",
+              "label": "VLAN",
+              "name": "vlan",
+              "input_type": "select",
+              "options": "%VLAN_OPTIONS%",
+              "hint": "VLAN to assign after 802.1X authentication."
+            },
+            {
+              "type": "raw_html",
+              "html": "</div>"
+            },
+            {
+              "type": "hr"
+            },
             {
               "type": "field_row",
               "cols": 2,
@@ -126,32 +160,6 @@
             {
               "type": "hr"
             },
-            {
-              "type": "field",
-              "label": "User Type",
-              "name": "user_type",
-              "input_type": "select",
-              "options": [
-                {"value": "",  "label": "-- Select User Type --"},
-                {"value": "0", "label": "Captive Portal"},
-                {"value": "1", "label": "802.1X Supplicant"}
-              ]
-            },
-            {
-              "type": "raw_html",
-              "html": "<script id=\"captive-vlan-data\" type=\"application/json\">%CAPTIVE_VLAN_OPTIONS%</script><script id=\"page-flags\" type=\"application/json\">{\"pro\": %PRO_LICENSE_JS%}</script>"
-            },
-            {
-              "type": "field",
-              "label": "VLAN",
-              "name": "vlan",
-              "input_type": "select",
-              "options": "%VLAN_OPTIONS%",
-              "hint": "VLAN to assign after 802.1X authentication."
-            },
-            {
-              "type": "hr"
-            },
             {
               "type": "field_row",
               "cols": 2,
diff --git a/docker/routlin-portal/app/main.py b/docker/routlin-portal/app/main.py
index ccd8638..ae9bfca 100644
--- a/docker/routlin-portal/app/main.py
+++ b/docker/routlin-portal/app/main.py
@@ -1,5 +1,5 @@
 from flask import Flask
-from pages.portal.page import bp as portal_bp
+from page import bp as portal_bp
 
 app = Flask(__name__)
 app.register_blueprint(portal_bp)
diff --git a/docker/routlin-portal/app/pages/portal/page.py b/docker/routlin-portal/app/page.py
similarity index 100%
rename from docker/routlin-portal/app/pages/portal/page.py
rename to docker/routlin-portal/app/page.py
diff --git a/docker/routlin-portal/app/pages/portal/__init__.py b/docker/routlin-portal/app/pages/portal/__init__.py
deleted file mode 100644
index e69de29..0000000