diff --git a/README.MD b/README.MD
index 08f3688..1fd1b11 100644
--- a/README.MD
+++ b/README.MD
@@ -15,3 +15,94 @@ these instructions:
   https://developer.chrome.com/docs/extensions/mv3/getstarted/development-basics/#load-unpacked
 - Microsoft Edge:
   https://docs.microsoft.com/en-us/microsoft-edge/extensions-chromium/getting-started/extension-sideloading
+
+
+# How does the extension work.
+
+Extensions have two types of scripts: background scripts and content scripts.
+- Background scripts run in the background of the browser and can be used to
+  listen to events and perform actions that are common to all tabs.
+- Content scripts run in the context of a tab and can be used to interact with
+  the DOM of the page.
+
+Here in our extension, we store the spaceId, apiKey, selectedCollection, and selectedDemo. Storing and retrieving these 
+values is done using the chrome.storage API. The background script does the storing and retrieving of these values.
+
+
+Messaging between the background script and the content script is done using the chrome.runtime API. 
+
+# dodao-upload.js and dodao-content.js
+All the content on the DOM is created in dodao-content.js. This is the content script. When any action is done on the
+UI, we listen to the action, and pass a message to the background script. 
+
+For example
+
+# Loading of the extension
+When the extension icon is clicked, the background checks if the spaceId and apiKey exists, if it exists, it send a message
+to the content script(dodao-content.js), to draw the bottom bar.
+
+If the spaceId and apiKey does not exist, it sends a message to the content script to draw the modal to capture the spaceId
+and apiKey.
+
+The UI captures it and then sends a message to the background script to store the spaceId and apiKey.
+
+
+# When we enter file name of capture
+when user enters the "Html capture" file name, we call the background script and pass the filename. 
+
+Background script has the logic to see what needs to be done, and what UI needs to be shown next. In this case, the 
+background will initiate download of the file by calling `business.saveTabs` method and passing dodao specific config.
+
+
+# Showing of extension
+The extension is shown when the user clicks on the extension icon. The background script listens to the click event. Its
+present in `ui-button.js`
+
+```javascript
+browser.action.onClicked.addListener(async tab => {
+	await business.extensionIconClicked(tab);
+});
+```
+
+Earlier(base code of extension), used to call saveTab, which used to download the file. Now we show the bottom bar
+or the spaceId and apiKey modal. `business.extensionIconClicked(tab)` this function was written by us.
+
+# Important files
+- `dodao-upload.js` - This is the background script. This is the script that listens to the messages from the content script
+  and does the necessary actions. This has the logic to decide what should be done next, i.e. flow of the extension.
+- `dodao-content.js` - This is the content script. This is the script that interacts with the DOM of the page. This is the
+  script that creates the UI on the page. i.e. the bottom bar or the modals, or the success and error messages.
+- `background.js` - This has the logic for post handler of download of the file. This in our flow is called from `content.js` (existing logic of the extension)
+  ```javascript
+  const pageData = await processPage(options);
+  if (pageData) {
+    await download.downloadPage(pageData, options);
+  }
+  ```
+  We just modify a couple of lines in download.js. This file then does the post handling of the download and send a message "downloads.download"
+  
+  Here is some of the custom logic
+  ```javascript
+    if (options.saveWithTidbitsHub) {
+        // we capture screenshot using options.content as it contains whole page content for the screesnhot
+        message.dodaoScreenshotBlobUrl = await getDodaoScreenshotBlobUrl(options.content);
+    }
+  ```
+- `download.js` - This is the file that handles the download of the file. This is the file that listens to the message "downloads.download"
+   We added some custom code to this file which looks like 
+   ```javascript
+    if (message.saveWithTidbitsHub) {
+      // adding the scripts to the content
+      message.pageData.content=injectScriptLinkTags(message.pageData.content)
+    } 
+    ```
+    This is the code that injects the scripts to the content. Like the dodao tooltip, selector, css, and tippy scripts
+
+    ```javascript
+     else if (message.saveWithTidbitsHub) {
+        const blob = await (await fetch(blobURI)).blob();
+        const screenshotBlob = new Blob([await (await fetch(message.dodaoScreenshotBlobUrl)).blob()], { type: "image/png" });
+        await uploadFileToDodao(message.captureHtmlScreenFileName, blob, screenshotBlob);
+	 }
+    ```
+    This code send the message to dodao api to upload the html capture.
diff --git a/manifest.json b/manifest.json
index 6a12087..9edac1c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -54,14 +54,6 @@
 	"background": {
 		"service_worker": "lib/single-file-extension-background.js"
 	},
-	"side_panel": {
-		"default_path": "src/ui/pages/panel.html"
-	},
-	"options_ui": {
-		"browser_style": true,
-		"page": "src/ui/pages/options.html",
-		"open_in_tab": false
-	},
 	"action": {
 		"default_icon": {
 			"16": "src/ui/resources/icon_16.png",
@@ -71,20 +63,7 @@
 		},
 		"default_title": "__MSG_buttonDefaultTooltip__"
 	},
-	"commands": {
-		"save-selected-tabs": {
-			"suggested_key": {
-				"default": "Ctrl+Shift+Y"
-			},
-			"description": "__MSG_commandSaveSelectedTabs__"
-		},
-		"save-all-tabs": {
-			"suggested_key": {
-				"default": "Ctrl+Shift+U"
-			},
-			"description": "__MSG_commandSaveAllTabs__"
-		}
-	},
+	"commands": {},
 	"web_accessible_resources": [
 		{
 			"matches": [
diff --git a/src/core/common/dodao-screenshot.js b/src/core/common/dodao-screenshot.js
index 428fd4c..8b9963d 100644
--- a/src/core/common/dodao-screenshot.js
+++ b/src/core/common/dodao-screenshot.js
@@ -1,32 +1,20 @@
-import html2canvas from "html2canvas";
+import * as ui from "./../../ui/content/content-ui.js";
 
-export async function getDodaoScreenshotBlobUrl(content) {
-  const iframe = createIframeWithContent(content);
-  document.body.appendChild(iframe);
+export async function getDodaoScreenshotBlobUrl(options) {
+  ui.setVisible(false);
 
-  const dodaoScreenshotBlobUrl = await new Promise((resolve, reject) => {
-    iframe.onload = async () => {
-      const iframeDocument = iframe.contentDocument;
-      const canvas = await html2canvas(iframeDocument.body, {
-        width: 1920,
-        height: 1080,
-        windowWidth: 1920,
-        windowHeight: 1080,
-        useCORS: true,
-        allowTaint: true,
-      });
-
-      const canvasBlob = await canvasToBlob(canvas);
-
-      const dodaoScreenshotBlobUrl = URL.createObjectURL(canvasBlob);
-      // remove the iframe after screesnhot is taken
-      document.body.removeChild(iframe);
-      
-      resolve(dodaoScreenshotBlobUrl);
-    };
+  const screenshotBlobURI = await browser.runtime.sendMessage({
+    method: "tabs.getScreenshot",
+    width: window.innerWidth,
+    height: window.innerHeight,
+    innerHeight: globalThis.innerHeight,
   });
-
-  return dodaoScreenshotBlobUrl;
+  ui.setVisible(true);
+  const embeddedImage = new Uint8Array(
+    await (await fetch(screenshotBlobURI)).arrayBuffer()
+  );
+  const blob = new Blob([embeddedImage], { type: "image/png" });
+  return URL.createObjectURL(blob);
 }
 
 function createIframeWithContent(htmlContent) {
diff --git a/src/core/common/dodao-utils.js b/src/core/common/dodao-utils.js
index 48725b4..5a25b97 100644
--- a/src/core/common/dodao-utils.js
+++ b/src/core/common/dodao-utils.js
@@ -5,11 +5,13 @@ export const CLIKABLE_FILES_HOST_URL = "https://dodao-prod-public-assets.s3.amaz
 
 export function injectScriptLinkTags(htmlContent) {
   console.log("Injecting script and link tags into HTML content");
-  const insertionIndex = findInsertionIndex(htmlContent);
+  // Add `allow-same-origin` to iframes
+  const updatedHtmlContent = addAllowSameOriginToIframes(htmlContent);
+  const insertionIndex = findInsertionIndex(updatedHtmlContent);
 
   if (insertionIndex !== undefined) {
     const tags = getScriptLinkTags();
-    const modifiedHtml = insertTagsIntoHtml(htmlContent, insertionIndex, tags);
+    const modifiedHtml = insertTagsIntoHtml(updatedHtmlContent, insertionIndex, tags);
     return modifiedHtml;
   } else {
     console.warn("Unable to find opening style tag in HTML content");
@@ -17,6 +19,31 @@ export function injectScriptLinkTags(htmlContent) {
   }
 }
 
+function addAllowSameOriginToIframes(htmlContent) {
+  // Regular expression to find all <iframe> tags
+  return htmlContent.replace(/<iframe([^>]*)>/g, (match, attributes) => {
+    // Check if `sandbox` attribute exists
+    const sandboxMatch = attributes.match(/sandbox="([^"]*)"/);
+    if (sandboxMatch) {
+      // `sandbox` attribute exists, check if `allow-same-origin` is already present
+      const sandboxValue = sandboxMatch[1];
+      if (!sandboxValue.includes("allow-same-origin")) {
+        // Append `allow-same-origin` to existing `sandbox` value
+        const newSandboxValue = `sandbox="${sandboxValue} allow-same-origin"`;
+        return `<iframe${attributes.replace(
+          sandboxMatch[0],
+          newSandboxValue
+        )}>`;
+      }
+    } else {
+      // `sandbox` attribute does not exist, add it with `allow-same-origin`
+      return `<iframe${attributes} sandbox="allow-same-origin">`;
+    }
+    // If `allow-same-origin` is already present, return the original match
+    return match;
+  });
+}
+
 export function slugify(string) {
   return string
     .toString()
diff --git a/src/core/common/download.js b/src/core/common/download.js
index c1709c1..e7534ff 100644
--- a/src/core/common/download.js
+++ b/src/core/common/download.js
@@ -26,8 +26,7 @@
 import * as yabson from "./../../lib/yabson/yabson.js";
 import * as ui from "./../../ui/content/content-ui.js";
 import { getSharePageBar, setLabels } from "./../../ui/common/common-content-ui.js";
-import html2canvas from "html2canvas";
-import {getDodaoScreenshotBlobUrl} from "./dodao-screenshot.js";
+import { getDodaoScreenshotBlobUrl } from "./dodao-screenshot.js";
 
 const MAX_CONTENT_SIZE = 16 * (1024 * 1024);
 
@@ -129,7 +128,6 @@ async function downloadPage(pageData, options) {
 		}
 		if (pageData.filename) {
 			if (options.saveWithTidbitsHub) {
-				// we capture screenshot using options.content as it contains whole page content for the screesnhot
 				message.dodaoScreenshotBlobUrl = await getDodaoScreenshotBlobUrl(options.content);
 			}
 			const blob = new Blob([await yabson.serialize(pageData)], { type: pageData.mimeType });
@@ -173,10 +171,6 @@ async function downloadPage(pageData, options) {
 				message.filename = pageData.filename = filename;
 				pageData.filename = options.captureHtmlScreenFileName;
 
-				if(options.saveWithTidbitsHub) {
-					message.dodaoScreenshotBlobUrl = await getDodaoScreenshotBlobUrl(pageData.content);
-				}
-
 				const blobURL = URL.createObjectURL(new Blob([pageData.content], { type: pageData.mimeType }));
 				message.blobURL = blobURL;
 				console.log('message in download.js', message);
@@ -272,4 +266,4 @@ function saveToClipboard(pageData) {
 		event.clipboardData.setData("text/plain", pageData.content);
 		event.preventDefault();
 	}
-}
+}
\ No newline at end of file
diff --git a/src/core/content/content.js b/src/core/content/content.js
index 2eb81da..22bf7d3 100644
--- a/src/core/content/content.js
+++ b/src/core/content/content.js
@@ -362,4 +362,4 @@ async function processPage(options) {
 		}
 	}
 	return page;
-}
+}
\ No newline at end of file
diff --git a/src/core/content/dodao-content.js b/src/core/content/dodao-content.js
index 221c864..e84c2fb 100644
--- a/src/core/content/dodao-content.js
+++ b/src/core/content/dodao-content.js
@@ -1,15 +1,27 @@
 import { v4 as uuidv4 } from "uuid";
-import {
-  DODAO_API_BASE_URL, slugify,
-} from "../common/dodao-utils.js";
+import { DODAO_API_BASE_URL, slugify } from "../common/dodao-utils.js";
 export function init() {}
+
+const SPACE_ID_INPUT_ID = "space-id-input";
+const API_KEY_INPUT_ID = "api-key-input";
+const COLLECTION_NAME_INPUT_ID = "collection-name-input";
+const COLLECTION_DESCRIPTION_INPUT_ID = "collection-description-input";
+const DEMO_NAME_INPUT_ID = "demo-name-input";
+const DEMO_DESCRIPTION_INPUT_ID = "demo-description-input";
+const FILE_NAME_INPUT_ID = "file-name-input";
+
+function focusInHandler(event) {
+  event.stopPropagation();
+  event.preventDefault();
+}
+
 browser.runtime.onMessage.addListener(async (message) => {
   if (message.method === "dodaoContent.captureApiKey") {
     showSaveApiKeyAndSpaceIdScreen(message);
     return {};
   }
   if (message.method === "dodaoContent.selectClickableDemo") {
-    showsaveClickableDemoScreen(message);
+    showSaveClickableDemoScreen(message);
     return {};
   }
   if (message.method === "dodaoContent.renderBottomBar") {
@@ -56,7 +68,7 @@ function showSaveApiKeyAndSpaceIdScreen(message) {
   }
 }
 
-async function showsaveClickableDemoScreen(message) {
+async function showSaveClickableDemoScreen(message) {
   if (message.data.error) {
     showErrorNotification(message.data.error);
     setTimeout(async () => {
@@ -82,6 +94,7 @@ function showLoginScreen(message) {
     {
       className: "space-id-input",
       placeholder: "Enter your Space ID",
+      id: SPACE_ID_INPUT_ID,
       styles: {
         width: "90%",
         padding: "10px",
@@ -90,6 +103,7 @@ function showLoginScreen(message) {
     },
     {
       className: "api-key-input",
+      id: API_KEY_INPUT_ID,
       placeholder: "Enter your API key from the space settings page:",
       styles: {
         width: "90%",
@@ -154,13 +168,13 @@ async function showCollectionSelection(
 async function fetchCollections(spaceId) {
   try {
     const response = await fetch(
-      `${DODAO_API_BASE_URL}/api/byte-collection/byte-collections?spaceId=${spaceId}`
+      `${DODAO_API_BASE_URL}/api/${spaceId}/byte-collections`
     );
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
     const data = await response.json();
-    return data.byteCollections || [];
+    return data || [];
   } catch (error) {
     console.error("Failed to fetch collections:", error);
     return null;
@@ -217,7 +231,11 @@ function showCollectionList(
     collections.length > 0
       ? "Select a Collection from the List Below:"
       : "No collections found. Create a new collection.",
-    { marginBottom: "10px", color: "#FFF" }
+    { 
+      marginBottom: "10px", 
+      color: "#FFF", 
+      fontSize: "20px" 
+    }
   );
 
   const collectionList = document.createElement("div");
@@ -242,6 +260,7 @@ function showCollectionList(
       marginTop: "20px",
       marginBottom: "10px",
       color: "#FFF",
+      fontSize: "20px",
     }
   );
   const createCollectionButton = createButton(
@@ -283,6 +302,7 @@ function showCreateCollectionScreen(
     {
       className: "collection-name-input",
       placeholder: "Enter collection name",
+      id: COLLECTION_NAME_INPUT_ID,
       styles: {
         width: "90%",
         padding: "10px",
@@ -292,6 +312,7 @@ function showCreateCollectionScreen(
     {
       className: "collection-description-input",
       placeholder: "Enter collection description",
+      id: COLLECTION_DESCRIPTION_INPUT_ID,
       styles: {
         width: "90%",
         padding: "10px",
@@ -428,7 +449,7 @@ function showDemoList(
     demos.length > 0
       ? "Select a Demo from the List Below:"
       : "No demos found. Create a new demo.",
-    { marginBottom: "10px", color: "#FFF" }
+    { marginBottom: "10px", color: "#FFF", fontSize: "20px" }
   );
 
   const demoList = document.createElement("div");
@@ -448,6 +469,7 @@ function showDemoList(
     marginTop: "20px",
     marginBottom: "10px",
     color: "#FFF",
+    fontSize: "20px",
   });
 
   const createDemoButton = createButton(
@@ -541,9 +563,9 @@ function setupBottomBarWithDemo(
     removeModalElement();
     showLoginScreen();
   });
-  logoutButton.style.marginLeft = "10px";
-  logoutButton.style.marginRight = "10px";
-  logoutButton.style.width = "10%";
+  logoutButton.style.marginLeft = "5px";
+  logoutButton.style.marginRight = "5px";
+  logoutButton.style.width = "8%";
 
   const demoTitle = document.createElement("span");
   demoTitle.id = selectedClickableDemo.id;
@@ -574,15 +596,22 @@ function setupBottomBarWithDemo(
     }
   );
 
+  // Create the close button
+  const closeButton = createButton("✕", "close-button", async () => {
+    bottomBar.style.display = "none";
+  });
+
   const buttonContainer = document.createElement("div");
   buttonContainer.style.display = "flex";
   buttonContainer.style.gap = "10px";
   buttonContainer.appendChild(saveButton);
   buttonContainer.appendChild(chooseAnotherButton);
 
+  // Append elements to the bottom bar
   bottomBar.appendChild(logoutButton);
   bottomBar.appendChild(demoTitle);
   bottomBar.appendChild(buttonContainer);
+  bottomBar.appendChild(closeButton); // Append close button last, for right alignment
 
   document.body.appendChild(bottomBar);
 }
@@ -597,6 +626,7 @@ function showCreateDemoScreen(
     {
       className: "demo-name-input",
       placeholder: "Enter demo name",
+      id: DEMO_NAME_INPUT_ID,
       styles: {
         width: "90%",
         padding: "10px",
@@ -606,6 +636,7 @@ function showCreateDemoScreen(
     {
       className: "demo-description-input",
       placeholder: "Enter demo description",
+      id: DEMO_DESCRIPTION_INPUT_ID,
       styles: {
         width: "90%",
         padding: "10px",
@@ -737,7 +768,7 @@ function addLogoutButton() {
 
 async function captureScreenHtml(spaceId, apiKey, demo, collection) {
   const demoId = demo.demoId;
-  const apiUrl = `${DODAO_API_BASE_URL}/api/${spaceId}/html-captures/${demoId}`;
+  const apiUrl = `${DODAO_API_BASE_URL}/api/${spaceId}/html-captures?clickableDemoId=${demoId}`;
   let existingFiles = [];
   try {
     const response = await fetch(apiUrl, {
@@ -780,6 +811,7 @@ async function captureScreenHtml(spaceId, apiKey, demo, collection) {
     {
       className: "file-name-input",
       placeholder: "Enter file name",
+      id: FILE_NAME_INPUT_ID,
       styles: {
         width: "90%",
         marginBottom: "10px",
@@ -849,6 +881,8 @@ function createModalForm({
   cancelButtonClass = "cancel-button",
   cancelButtonHandler,
 }) {
+  document.addEventListener("focusin", focusInHandler, true);
+
   // Create the modal element and container for the form
   const modalElement = createNewModalElement(title);
   const formContainer = modalElement;
@@ -870,11 +904,16 @@ function createModalForm({
       inputConfig.className || "",
       inputConfig.styles || {}
     );
+    inputElement.id = inputConfig.id;
     formContainer.appendChild(inputElement);
     // Store the input element reference inside the inputConfig object
     inputConfig.element = inputElement;
   });
 
+  requestAnimationFrame(() => {
+    inputs[0].element.focus();
+  });
+
   // Create the submit button
   const submitButton = createButton(
     submitButtonText,
@@ -940,6 +979,7 @@ function createNewModalElement(
   }
   const fullScreenModalWrapper = document.createElement("div");
   fullScreenModalWrapper.id = "dodao-full-screen-modal-wrapper";
+
   document.body.appendChild(fullScreenModalWrapper);
   const shadowRoot = fullScreenModalWrapper.attachShadow({ mode: "open" });
   shadowRoot.appendChild(createModalStyle());
@@ -988,6 +1028,8 @@ function createModalStyle() {
       position: fixed;
       top: 0;
       left: 0;
+      bottom: 0;
+      right: 0;
       font-size: 24px;
       flex-direction: column;
       width: 100%;
@@ -1044,8 +1086,8 @@ function createModalStyle() {
         transition: background-color 0.3s ease;
       }
     .modal-content {
-      width: 90%;
-      max-width:800px;
+      width: 80%;
+      max-width:700px;
       overflow:hidden;
       display: flex;
       flex-direction: column;
@@ -1065,9 +1107,9 @@ function createModalStyle() {
       margin-bottom: 10px; 
     }
     input, button {
-      padding: 14px 22px;
-      margin-top: 12px;
-      font-size: 24px;
+      padding: 7px 11px;
+      margin-top: 6px;
+      font-size: 16px;
       width: 100%;
       box-sizing: border-box;
     }
@@ -1087,7 +1129,11 @@ function createModalStyle() {
       border: none;
       border-radius: 4px;
       cursor: pointer;
+      padding: 10px 20px;             
+      font-size: 16px;                
+      max-width: 100%;
       transition: background-color 0.3s, box-shadow 0.3s;
+      white-space: nowrap;
     }
     button:hover, button:focus {
       background-color: #0056b3;
@@ -1119,14 +1165,15 @@ function createBottomBarStyle() {
       padding: 0 20px; 
     }
     #bottom-bar .demo-name {
+      padding-left: 20px;
       flex-grow: 1;
-      font-size:24px;
+      font-size: 18px;
       font-weight: bold; 
-      line-height: 70px; 
+      line-height: 50px; 
     }
     #bottom-bar button {
-      padding: 10px 20px;
-      font-size: 24px;
+      padding: 6px 12px;
+      font-size: 16px;
       border: none;
       background-color: #007bff; 
       color: #fff;
@@ -1143,6 +1190,21 @@ function createBottomBarStyle() {
     #bottom-bar button:hover {
       background-color: #0056b3; 
     }
+    #bottom-bar .close-button {
+      font-size: 18px;
+      background: transparent;
+      border: none;
+      color: #fff;
+      cursor: pointer;
+      padding: 5px 10px;
+      margin-left: 20px;
+      transition: color 0.2s;
+    }
+
+    #bottom-bar .close-button:hover {
+      color: #888; /* Light gray on hover */
+      background-color: #e34257;
+    }
   `;
   return styleElement;
 }
@@ -1185,6 +1247,7 @@ function removeModalElement() {
   if (modalWrapper) {
     modalWrapper.remove();
   }
+  document.removeEventListener("focusin", focusInHandler, true);
 }
 
 function displayErrorModal(message, retryHandler) {
@@ -1210,7 +1273,6 @@ function createMessageElement(text, styles = {}) {
   return messageElement;
 }
 
-
 function createNewEntityId(entityName, spaceId) {
   const firstSegment = spaceId.split("-")[0];
   const normalizedSpaceId = firstSegment.substring(
diff --git a/src/ui/bg/ui-menus.js b/src/ui/bg/ui-menus.js
index 196352a..d847ffd 100644
--- a/src/ui/bg/ui-menus.js
+++ b/src/ui/bg/ui-menus.js
@@ -143,16 +143,16 @@ async function createMenus(tab) {
 			contexts: defaultContexts,
 			title: MENU_SAVE_PAGE_MESSAGE
 		});
-		menus.create({
-			id: MENU_ID_EDIT_AND_SAVE_PAGE,
-			contexts: defaultContexts,
-			title: MENU_EDIT_AND_SAVE_PAGE_MESSAGE
-		});
-		menus.create({
-			id: MENU_ID_SAVE_SELECTED_LINKS,
-			contexts: options.contextMenuEnabled ? defaultContextsDisabled.concat(["selection"]) : defaultContextsDisabled,
-			title: MENU_SAVE_SELECTED_LINKS
-		});
+		// menus.create({
+		// 	id: MENU_ID_EDIT_AND_SAVE_PAGE,
+		// 	contexts: defaultContexts,
+		// 	title: MENU_EDIT_AND_SAVE_PAGE_MESSAGE
+		// });
+		// menus.create({
+		// 	id: MENU_ID_SAVE_SELECTED_LINKS,
+		// 	contexts: options.contextMenuEnabled ? defaultContextsDisabled.concat(["selection"]) : defaultContextsDisabled,
+		// 	title: MENU_SAVE_SELECTED_LINKS
+		// });
 		if (Object.keys(profiles).length > 1) {
 			menus.create({
 				id: MENU_ID_SAVE_WITH_PROFILE,
@@ -167,11 +167,11 @@ async function createMenus(tab) {
 				type: "separator"
 			});
 		}
-		menus.create({
-			id: MENU_ID_SAVE_SELECTED,
-			contexts: defaultContexts,
-			title: MENU_SAVE_SELECTION_MESSAGE
-		});
+		// menus.create({
+		// 	id: MENU_ID_SAVE_SELECTED,
+		// 	contexts: defaultContexts,
+		// 	title: MENU_SAVE_SELECTION_MESSAGE
+		// });
 		if (options.contextMenuEnabled) {
 			menus.create({
 				id: MENU_ID_SAVE_FRAME,
@@ -179,29 +179,29 @@ async function createMenus(tab) {
 				title: MENU_SAVE_FRAME_MESSAGE
 			});
 		}
-		menus.create({
-			id: MENU_ID_SAVE_TABS,
-			contexts: defaultContextsDisabled,
-			title: MENU_SAVE_TABS_MESSAGE
-		});
-		menus.create({
-			id: MENU_ID_BUTTON_SAVE_SELECTED_TABS,
-			contexts: defaultContextsDisabled,
-			title: MENU_SAVE_SELECTED_TABS_MESSAGE,
-			parentId: MENU_ID_SAVE_TABS
-		});
-		menus.create({
-			id: MENU_ID_BUTTON_SAVE_UNPINNED_TABS,
-			contexts: defaultContextsDisabled,
-			title: MENU_SAVE_UNPINNED_TABS_MESSAGE,
-			parentId: MENU_ID_SAVE_TABS
-		});
-		menus.create({
-			id: MENU_ID_BUTTON_SAVE_ALL_TABS,
-			contexts: defaultContextsDisabled,
-			title: MENU_SAVE_ALL_TABS_MESSAGE,
-			parentId: MENU_ID_SAVE_TABS
-		});
+		// menus.create({
+		// 	id: MENU_ID_SAVE_TABS,
+		// 	contexts: defaultContextsDisabled,
+		// 	title: MENU_SAVE_TABS_MESSAGE
+		// });
+		// menus.create({
+		// 	id: MENU_ID_BUTTON_SAVE_SELECTED_TABS,
+		// 	contexts: defaultContextsDisabled,
+		// 	title: MENU_SAVE_SELECTED_TABS_MESSAGE,
+		// 	parentId: MENU_ID_SAVE_TABS
+		// });
+		// menus.create({
+		// 	id: MENU_ID_BUTTON_SAVE_UNPINNED_TABS,
+		// 	contexts: defaultContextsDisabled,
+		// 	title: MENU_SAVE_UNPINNED_TABS_MESSAGE,
+		// 	parentId: MENU_ID_SAVE_TABS
+		// });
+		// menus.create({
+		// 	id: MENU_ID_BUTTON_SAVE_ALL_TABS,
+		// 	contexts: defaultContextsDisabled,
+		// 	title: MENU_SAVE_ALL_TABS_MESSAGE,
+		// 	parentId: MENU_ID_SAVE_TABS
+		// });
 		if (options.contextMenuEnabled) {
 			menus.create({
 				id: MENU_ID_SAVE_SELECTED_TABS,
@@ -323,57 +323,57 @@ async function createMenus(tab) {
 				});
 			}
 		}
-		menus.create({
-			id: MENU_ID_AUTO_SAVE,
-			contexts: defaultContexts,
-			title: MENU_AUTOSAVE_MESSAGE
-		});
-		menus.create({
-			id: MENU_ID_AUTO_SAVE_DISABLED,
-			type: "radio",
-			title: MENU_AUTOSAVE_DISABLED_MESSAGE,
-			contexts: defaultContexts,
-			checked: true,
-			parentId: MENU_ID_AUTO_SAVE
-		});
-		menusCheckedState.set(MENU_ID_AUTO_SAVE_DISABLED, true);
-		menus.create({
-			id: MENU_ID_AUTO_SAVE_TAB,
-			type: "radio",
-			title: MENU_AUTOSAVE_TAB_MESSAGE,
-			contexts: defaultContexts,
-			checked: false,
-			parentId: MENU_ID_AUTO_SAVE
-		});
-		menusCheckedState.set(MENU_ID_AUTO_SAVE_TAB, false);
-		menus.create({
-			id: MENU_ID_AUTO_SAVE_UNPINNED,
-			type: "radio",
-			title: MENU_AUTOSAVE_UNPINNED_TABS_MESSAGE,
-			contexts: defaultContexts,
-			checked: false,
-			parentId: MENU_ID_AUTO_SAVE
-		});
-		menusCheckedState.set(MENU_ID_AUTO_SAVE_UNPINNED, false);
-		menus.create({
-			id: MENU_ID_AUTO_SAVE_ALL,
-			type: "radio",
-			title: MENU_AUTOSAVE_ALL_TABS_MESSAGE,
-			contexts: defaultContexts,
-			checked: false,
-			parentId: MENU_ID_AUTO_SAVE
-		});
-		menusCheckedState.set(MENU_ID_AUTO_SAVE_ALL, false);
+		// menus.create({
+		// 	id: MENU_ID_AUTO_SAVE,
+		// 	contexts: defaultContexts,
+		// 	title: MENU_AUTOSAVE_MESSAGE
+		// });
+		// menus.create({
+		// 	id: MENU_ID_AUTO_SAVE_DISABLED,
+		// 	type: "radio",
+		// 	title: MENU_AUTOSAVE_DISABLED_MESSAGE,
+		// 	contexts: defaultContexts,
+		// 	checked: true,
+		// 	parentId: MENU_ID_AUTO_SAVE
+		// });
+		// menusCheckedState.set(MENU_ID_AUTO_SAVE_DISABLED, true);
+		// menus.create({
+		// 	id: MENU_ID_AUTO_SAVE_TAB,
+		// 	type: "radio",
+		// 	title: MENU_AUTOSAVE_TAB_MESSAGE,
+		// 	contexts: defaultContexts,
+		// 	checked: false,
+		// 	parentId: MENU_ID_AUTO_SAVE
+		// });
+		// menusCheckedState.set(MENU_ID_AUTO_SAVE_TAB, false);
+		// menus.create({
+		// 	id: MENU_ID_AUTO_SAVE_UNPINNED,
+		// 	type: "radio",
+		// 	title: MENU_AUTOSAVE_UNPINNED_TABS_MESSAGE,
+		// 	contexts: defaultContexts,
+		// 	checked: false,
+		// 	parentId: MENU_ID_AUTO_SAVE
+		// });
+		// menusCheckedState.set(MENU_ID_AUTO_SAVE_UNPINNED, false);
+		// menus.create({
+		// 	id: MENU_ID_AUTO_SAVE_ALL,
+		// 	type: "radio",
+		// 	title: MENU_AUTOSAVE_ALL_TABS_MESSAGE,
+		// 	contexts: defaultContexts,
+		// 	checked: false,
+		// 	parentId: MENU_ID_AUTO_SAVE
+		// });
+		// menusCheckedState.set(MENU_ID_AUTO_SAVE_ALL, false);
 		menus.create({
 			id: "separator-4",
 			contexts: defaultContexts,
 			type: "separator"
 		});
-		menus.create({
-			id: MENU_ID_BATCH_SAVE_URLS,
-			contexts: defaultContexts,
-			title: MENU_BATCH_SAVE_URLS_MESSAGE
-		});
+		// menus.create({
+		// 	id: MENU_ID_BATCH_SAVE_URLS,
+		// 	contexts: defaultContexts,
+		// 	title: MENU_BATCH_SAVE_URLS_MESSAGE
+		// });
 		menus.create({
 			id: MENU_ID_VIEW_PENDINGS,
 			contexts: defaultContexts,
@@ -397,27 +397,27 @@ async function initialize() {
 				business.saveTabs([tab]);
 			}
 		}
-		if (event.menuItemId == MENU_ID_EDIT_AND_SAVE_PAGE) {
-			const allTabsData = await tabsData.get(tab.id);
-			if (allTabsData[tab.id].savedPageDetected) {
-				business.openEditor(tab);
-			} else {
-				if (event.linkUrl) {
-					business.saveUrls([event.linkUrl], { openEditor: true });
-				} else {
-					business.saveTabs([tab], { openEditor: true });
-				}
-			}
-		}
+		// if (event.menuItemId == MENU_ID_EDIT_AND_SAVE_PAGE) {
+		// 	const allTabsData = await tabsData.get(tab.id);
+		// 	if (allTabsData[tab.id].savedPageDetected) {
+		// 		business.openEditor(tab);
+		// 	} else {
+		// 		if (event.linkUrl) {
+		// 			business.saveUrls([event.linkUrl], { openEditor: true });
+		// 		} else {
+		// 			business.saveTabs([tab], { openEditor: true });
+		// 		}
+		// 	}
+		// }
 		if (event.menuItemId == MENU_ID_SAVE_SELECTED_LINKS) {
 			business.saveSelectedLinks(tab);
 		}
 		if (event.menuItemId == MENU_ID_VIEW_PENDINGS) {
 			await browser.tabs.create({ active: true, url: "/src/ui/pages/pendings.html" });
 		}
-		if (event.menuItemId == MENU_ID_SAVE_SELECTED) {
-			business.saveTabs([tab], { selected: true });
-		}
+		// if (event.menuItemId == MENU_ID_SAVE_SELECTED) {
+		// 	business.saveTabs([tab], { selected: true });
+		// }
 		if (event.menuItemId == MENU_ID_SAVE_FRAME) {
 			business.saveTabs([tab], { frameId: event.frameId });
 		}
@@ -436,35 +436,35 @@ async function initialize() {
 		if (event.menuItemId == MENU_ID_BATCH_SAVE_URLS) {
 			business.batchSaveUrls();
 		}
-		if (event.menuItemId == MENU_ID_AUTO_SAVE_TAB) {
-			const allTabsData = await tabsData.get(tab.id);
-			allTabsData[tab.id].autoSave = true;
-			await tabsData.set(allTabsData);
-			refreshExternalComponents(tab);
-		}
-		if (event.menuItemId == MENU_ID_AUTO_SAVE_DISABLED) {
-			const allTabsData = await tabsData.get();
-			Object.keys(allTabsData).forEach(tabId => {
-				if (typeof allTabsData[tabId] == "object" && allTabsData[tabId].autoSave) {
-					allTabsData[tabId].autoSave = false;
-				}
-			});
-			allTabsData.autoSaveUnpinned = allTabsData.autoSaveAll = false;
-			await tabsData.set(allTabsData);
-			refreshExternalComponents(tab);
-		}
-		if (event.menuItemId == MENU_ID_AUTO_SAVE_ALL) {
-			const allTabsData = await tabsData.get();
-			allTabsData.autoSaveAll = event.checked;
-			await tabsData.set(allTabsData);
-			refreshExternalComponents(tab);
-		}
-		if (event.menuItemId == MENU_ID_AUTO_SAVE_UNPINNED) {
-			const allTabsData = await tabsData.get();
-			allTabsData.autoSaveUnpinned = event.checked;
-			await tabsData.set(allTabsData);
-			refreshExternalComponents(tab);
-		}
+		// if (event.menuItemId == MENU_ID_AUTO_SAVE_TAB) {
+		// 	const allTabsData = await tabsData.get(tab.id);
+		// 	allTabsData[tab.id].autoSave = true;
+		// 	await tabsData.set(allTabsData);
+		// 	refreshExternalComponents(tab);
+		// }
+		// if (event.menuItemId == MENU_ID_AUTO_SAVE_DISABLED) {
+		// 	const allTabsData = await tabsData.get();
+		// 	Object.keys(allTabsData).forEach(tabId => {
+		// 		if (typeof allTabsData[tabId] == "object" && allTabsData[tabId].autoSave) {
+		// 			allTabsData[tabId].autoSave = false;
+		// 		}
+		// 	});
+		// 	allTabsData.autoSaveUnpinned = allTabsData.autoSaveAll = false;
+		// 	await tabsData.set(allTabsData);
+		// 	refreshExternalComponents(tab);
+		// }
+		// if (event.menuItemId == MENU_ID_AUTO_SAVE_ALL) {
+		// 	const allTabsData = await tabsData.get();
+		// 	allTabsData.autoSaveAll = event.checked;
+		// 	await tabsData.set(allTabsData);
+		// 	refreshExternalComponents(tab);
+		// }
+		// if (event.menuItemId == MENU_ID_AUTO_SAVE_UNPINNED) {
+		// 	const allTabsData = await tabsData.get();
+		// 	allTabsData.autoSaveUnpinned = event.checked;
+		// 	await tabsData.set(allTabsData);
+		// 	refreshExternalComponents(tab);
+		// }
 		if (event.menuItemId.startsWith(MENU_ID_SAVE_WITH_PROFILE_PREFIX)) {
 			const profiles = await config.getProfiles();
 			const profileId = event.menuItemId.split(MENU_ID_SAVE_WITH_PROFILE_PREFIX)[1];
@@ -536,16 +536,16 @@ async function refreshTab(tab) {
 			updateAllVisibleValues(false);
 		} else {
 			updateAllVisibleValues(true);
-			promises.push(updateCheckedValue(MENU_ID_AUTO_SAVE_DISABLED, !allTabsData[tab.id].autoSave));
-			promises.push(updateCheckedValue(MENU_ID_AUTO_SAVE_TAB, allTabsData[tab.id].autoSave));
-			promises.push(updateCheckedValue(MENU_ID_AUTO_SAVE_UNPINNED, Boolean(allTabsData.autoSaveUnpinned)));
-			promises.push(updateCheckedValue(MENU_ID_AUTO_SAVE_ALL, Boolean(allTabsData.autoSaveAll)));
+			// promises.push(updateCheckedValue(MENU_ID_AUTO_SAVE_DISABLED, !allTabsData[tab.id].autoSave));
+			// promises.push(updateCheckedValue(MENU_ID_AUTO_SAVE_TAB, allTabsData[tab.id].autoSave));
+			// promises.push(updateCheckedValue(MENU_ID_AUTO_SAVE_UNPINNED, Boolean(allTabsData.autoSaveUnpinned)));
+			// promises.push(updateCheckedValue(MENU_ID_AUTO_SAVE_ALL, Boolean(allTabsData.autoSaveAll)));
 			if (tab && tab.url) {
 				const options = await config.getOptions(tab.url);
 				promises.push(updateVisibleValue(tab, options.contextMenuEnabled));
-				promises.push(updateTitleValue(MENU_ID_EDIT_AND_SAVE_PAGE, allTabsData[tab.id].savedPageDetected ? MENU_EDIT_PAGE_MESSAGE : MENU_EDIT_AND_SAVE_PAGE_MESSAGE));
-				promises.push(menus.update(MENU_ID_SAVE_SELECTED, { visible: !options.saveRawPage }));
-				promises.push(menus.update(MENU_ID_EDIT_AND_SAVE_PAGE, { visible: !options.openEditor || allTabsData[tab.id].savedPageDetected }));
+				// promises.push(updateTitleValue(MENU_ID_EDIT_AND_SAVE_PAGE, allTabsData[tab.id].savedPageDetected ? MENU_EDIT_PAGE_MESSAGE : MENU_EDIT_AND_SAVE_PAGE_MESSAGE));
+				// promises.push(menus.update(MENU_ID_SAVE_SELECTED, { visible: !options.saveRawPage }));
+				// promises.push(menus.update(MENU_ID_EDIT_AND_SAVE_PAGE, { visible: !options.openEditor || allTabsData[tab.id].savedPageDetected }));
 				let selectedEntryId = MENU_ID_ASSOCIATE_WITH_PROFILE_PREFIX + "default";
 				let title = MENU_CREATE_DOMAIN_RULE_MESSAGE;
 				const [profiles, rule] = await Promise.all([config.getProfiles(), config.getRule(tab.url)]);