diff --git a/analyticshub/appinfo/routes.php b/analyticshub/appinfo/routes.php
index 95c931c..1ed7528 100644
--- a/analyticshub/appinfo/routes.php
+++ b/analyticshub/appinfo/routes.php
@@ -12,10 +12,16 @@ return [
     'routes' => [
         // Admin routes
         [
-            'name' => 'page#index',
+            'name' => 'admin#index',
             'url' => '/',
             'verb' => 'GET',
             'requirements' => [],
         ],
+        [
+            'name' => 'admin#load',
+            'url' => '/load',
+            'verb' => 'GET',
+            'requirements' => [],
+        ],
     ],
 ];
diff --git a/analyticshub/lib/Controller/Admin/PageController.php b/analyticshub/lib/Controller/Admin/PageController.php
new file mode 100644
index 0000000..2f1f087
--- /dev/null
+++ b/analyticshub/lib/Controller/Admin/PageController.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\AnalyticsHub\Controller\Admin;
+
+use OCP\IRequest;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IConfig;
+use OCA\AnalyticsHub\AppInfo\Application;
+use OCP\AppFramework\Controller;
+
+/**
+ * Admin Settings Controller
+ *
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+class PageController extends Controller {
+
+    private $appName;
+    protected $request;
+    private IConfig $config;
+
+    public function __construct(string $appName, IRequest $request, IConfig $config) {
+        parent::__construct($appName, $request);
+        $this->appName = $appName;
+        $this->request = $request;
+        $this->config = $config;
+    }
+
+    /**
+     * Index page - render admin UI
+     *
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function index(): TemplateResponse {
+        // Load saved configuration
+        $googleClientId = $this->config->getAppValue(Application::APP_NAME, 'google_client_id', '');
+        $googleClientSecret = '•••'; // Masked for display
+        $anthropicApiKey = '••••••••'; // Masked for display
+        $isConfigured = !empty($googleClientId) && !empty($this->config->getAppValue(Application::APP_NAME, 'anthropic_api_key', ''));
+
+        return new TemplateResponse($this->appName, 'admin', [
+            'app_name' => $this->appName,
+            'version' => Application::APP_VERSION,
+            'is_configured' => $isConfigured,
+            'google_client_id' => $googleClientId,
+            'google_client_secret_masked' => $googleClientSecret,
+            'anthropic_api_key_masked' => $anthropicApiKey,
+        ]);
+    }
+
+    /**
+     * Save configuration
+     *
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function save(): JSONResponse {
+        $params = $this->request->getParams();
+
+        // Validate required fields
+        if (!isset($params['google_client_id']) || empty($params['google_client_id'])) {
+            return new JSONResponse([
+                'success' => false,
+                'error' => 'Google Client ID is required'
+            ]);
+        }
+
+        if (!isset($params['google_client_secret']) || empty($params['google_client_secret'])) {
+            return new JSONResponse([
+                'success' => false,
+                'error' => 'Google Client Secret is required'
+            ]);
+        }
+
+        if (!isset($params['anthropic_api_key']) || empty($params['anthropic_api_key'])) {
+            return new JSONResponse([
+                'success' => false,
+                'error' => 'Anthropic API Key is required'
+            ]);
+        }
+
+        try {
+            // Save configuration
+            $this->config->setAppValue(Application::APP_NAME, 'google_client_id', $params['google_client_id']);
+            $this->config->setAppValue(Application::APP_NAME, 'google_client_secret', $params['google_client_secret']);
+            $this->config->setAppValue(Application::APP_NAME, 'anthropic_api_key', $params['anthropic_api_key']);
+
+            // Check if now configured
+            $isConfigured = !empty($params['google_client_id']) && !empty($params['anthropic_api_key']);
+
+            return new JSONResponse([
+                'success' => true,
+                'data' => [
+                    'is_configured' => $isConfigured,
+                    'message' => 'Configuration saved successfully'
+                ]
+            ]);
+
+        } catch (\Exception $e) {
+            return new JSONResponse([
+                'success' => false,
+                'error' => $e->getMessage()
+            ]);
+        }
+    }
+
+    /**
+     * Load configuration
+     *
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function load(): JSONResponse {
+        try {
+            // Load configuration
+            $googleClientId = $this->config->getAppValue(Application::APP_NAME, 'google_client_id', '');
+            $googleClientSecret = ''; // Don't expose secret
+            $anthropicApiKey = ''; // Don't expose secret
+
+            $isConfigured = !empty($googleClientId) && !empty($this->config->getAppValue(Application::APP_NAME, 'anthropic_api_key', ''));
+
+            return new JSONResponse([
+                'success' => true,
+                'data' => [
+                    'google_client_id' => $googleClientId,
+                    'google_client_secret_masked' => '•••', // Masked
+                    'anthropic_api_key_masked' => '••••••••', // Masked
+                    'is_configured' => $isConfigured,
+                ]
+            ]);
+
+        } catch (\Exception $e) {
+            return new JSONResponse([
+                'success' => false,
+                'error' => $e->getMessage()
+            ]);
+        }
+    }
+}
diff --git a/analyticshub/lib/Controller/AdminController.php b/analyticshub/lib/Controller/AdminController.php
new file mode 100644
index 0000000..bbc20c3
--- /dev/null
+++ b/analyticshub/lib/Controller/AdminController.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\AnalyticsHub\Controller\Admin;
+
+use OCP\IRequest;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Http\JSONResponse;
+
+/**
+ * Admin Settings Controller
+ *
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+class AdminController {
+
+    private $appName;
+    private $request;
+
+    public function __construct(string $appName, IRequest $request) {
+        $this->appName = $appName;
+        $this->request = $request;
+    }
+
+    /**
+     * Load configuration
+     */
+    public function load(): JSONResponse {
+        return new JSONResponse([
+            'success' => true,
+            'data' => [
+                'message' => 'Use PageController instead of AdminController',
+            ],
+        ]);
+    }
+}
diff --git a/analyticshub/lib/Controller/PageController.php b/analyticshub/lib/Controller/PageController.php
index 3b74a04..26ad327 100644
--- a/analyticshub/lib/Controller/PageController.php
+++ b/analyticshub/lib/Controller/PageController.php
@@ -2,9 +2,11 @@
 
 declare(strict_types=1);
 
-namespace OCA\AnalyticsHub\Controller;
+namespace OCA\AnalyticsHub\Controller\Admin;
 
 use OCP\IRequest;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCA\AnalyticsHub\AppInfo\Application;
 
 /**
  * Admin Settings Controller
@@ -12,11 +14,13 @@ use OCP\IRequest;
  * @NoAdminRequired
  * @NoCSRFRequired
  */
-class PageController {
+class PageController extends Controller {
+
+    private $appName;
 
     public function __construct(string $appName, IRequest $request) {
+        parent::__construct($appName, $request);
         $this->appName = $appName;
-        $this->request = $request;
     }
 
     /**
@@ -25,43 +29,11 @@ class PageController {
      * @NoAdminRequired
      * @NoCSRFRequired
      */
-    public function index(): void {
-        echo '<!DOCTYPE html>';
-        echo '<html>';
-        echo '<head>';
-        echo '<meta charset="UTF-8">';
-        echo '<title>Mini-CMO Analytics Hub - Testing</title>';
-        echo '<style>';
-        echo 'body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; padding: 40px; max-width: 800px; margin: 0 auto; background: #f5f5f5; }';
-        echo 'h1 { color: #0082c9; margin-bottom: 20px; }';
-        echo 'p { line-height: 1.6; color: #333; margin-bottom: 20px; }';
-        echo 'pre { background: #fff; padding: 15px; border: 1px solid #ddd; border-radius: 5px; overflow: auto; }';
-        echo 'code { background: #f0f0f0; padding: 10px; border-radius: 3px; font-family: monospace; font-size: 13px; }';
-        echo 'strong { color: #0066cc; }';
-        echo '</style>';
-        echo '</head>';
-        echo '<body>';
-        echo '<h1>🔧 Debug Mode - Admin Controller</h1>';
-        echo '<p><strong>App Name:</strong> ' . htmlspecialchars($this->appName) . '</p>';
-        echo '<p><strong>Request:</strong> ' . htmlspecialchars(print_r($this->request, true)) . '</p>';
-        echo '<hr>';
-        echo '<h2>System Status</h2>';
-        echo '<p><strong>Class:</strong> OCA\AnalyticsHub\Controller\PageController</p>';
-        echo '<p><strong>Method:</strong> index() invoked</p>';
-        echo '<p><strong>Namespace:</strong> OCA\AnalyticsHub\Controller</p>';
-        echo '<hr>';
-        echo '<h2>Controller Information</h2>';
-        echo '<p>✅ Controller successfully loaded</p>';
-        echo '<p>✅ index() method executed</p>';
-        echo '<hr>';
-        echo '<h2>Next Steps</h2>';
-        echo '<ul>';
-        echo '<li>Check if this page loads successfully</li>';
-        echo '<li>If successful, we can start building the actual admin interface</li>';
-        echo '<li>If error, check Nextcloud logs for more details</li>';
-        echo '</ul>';
-        echo '</body>';
-        echo '</html>';
-        exit;
+    public function index(): TemplateResponse {
+        return new TemplateResponse($this->appName, 'admin', [
+            'app_name' => $this->appName,
+            'version' => Application::APP_VERSION,
+            'status' => 'Ready for development',
+        ]);
     }
 }