diff --git a/manifest.json b/manifest.json
index 32af589..6643863 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,6 +4,11 @@
   "short_name": "PromptPilot",
   "version": "1.0.0",
   "description": "AI Prompt Copilot — Grammarly-style prompt enhancement. Select any text, click the PromptPilot icon, get expert-level structured prompts instantly.",
+
+  "content_security_policy": {
+    "extension_pages": "script-src 'self'; object-src 'none'; base-uri 'none'; connect-src 'self' https://generativelanguage.googleapis.com https://api.groq.com https://api.openai.com; img-src 'self' data:; style-src 'self' 'unsafe-inline';"
+  },
+
   "permissions": [
     "storage",
     "contextMenus",
@@ -11,25 +16,29 @@
     "scripting",
     "commands"
   ],
+
   "host_permissions": [
     "https://generativelanguage.googleapis.com/*",
     "https://api.groq.com/*",
     "https://api.openai.com/*",
     "<all_urls>"
-  ], 
+  ],
+
   "action": {
     "default_popup": "index.html",
     "default_title": "PromptPilot AI",
     "default_icon": {
-      "16":  "icons/icon16.png",
-      "48":  "icons/icon48.png",
+      "16": "icons/icon16.png",
+      "48": "icons/icon48.png",
       "128": "icons/icon128.png"
     }
   },
+
   "background": {
     "service_worker": "src/background.js",
     "type": "module"
   },
+
   "content_scripts": [
     {
       "matches": ["<all_urls>"],
@@ -38,6 +47,7 @@
       "all_frames": false
     }
   ],
+
   "commands": {
     "enhance-selection": {
       "suggested_key": {
@@ -47,15 +57,17 @@
       "description": "Enhance selected text with PromptPilot AI"
     }
   },
+
   "icons": {
-    "16":  "icons/icon16.png",
-    "48":  "icons/icon48.png",
+    "16": "icons/icon16.png",
+    "48": "icons/icon48.png",
     "128": "icons/icon128.png"
   },
+
   "web_accessible_resources": [
     {
       "resources": ["icons/*.png"],
       "matches": ["<all_urls>"]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/src/App.jsx b/src/App.jsx
index 19df6ad..c1af5a2 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,10 +1,10 @@
-import { exportHistoryAsJSON, generateHistoryMarkdown } from './exportUtils';
-import BackupControls from './BackupControls';
-
-<BackupControls />;
+// ✅ Remove the floating <BackupControls />
+// ✅ Remove the BackupControls import entirely (it's handled inside SettingsScreen already)
+// ✅ Group all imports together at the top
 
-import TemplateManager from "./components/TemplateManager";
 import { useState, useRef, useEffect, useCallback } from 'react';
+import { exportHistoryAsJSON, generateHistoryMarkdown } from './exportUtils';
+import TemplateManager from "./components/TemplateManager";
 import { versioningService } from './versioningService';
 import {
   PromptsList,