diff --git a/.gitignore b/.gitignore
index 6ff00a9..5e16ffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+package-lock.json
 node_modules
 README.html
 *.xpi
diff --git a/index.js b/index.js
index da9cf8d..4ebce44 100644
--- a/index.js
+++ b/index.js
@@ -1213,6 +1213,7 @@ ContainerWindow.prototype = {
         const menuItemElement = this._window.document.createElementNS(XUL_NS, "menuitem");
         this._panelElement.appendChild(menuItemElement);
         menuItemElement.className = "menuitem-iconic";
+        menuItemElement.setAttribute("tooltiptext", identity.name);
         menuItemElement.setAttribute("label", identity.name);
         menuItemElement.setAttribute("data-usercontextid", identity.userContextId);
         menuItemElement.setAttribute("data-identity-icon", identity.icon);
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index 51c6cd6..6ec07ad 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -520,7 +520,9 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
 
       context.classList.add("userContext-wrapper", "open-newtab", "clickable");
       manage.classList.add("show-tabs", "pop-button");
+      manage.title = escaped`View ${identity.name} container`;
       context.setAttribute("tabindex", "0");
+      context.title = escaped`Create ${identity.name} tab`;
       context.innerHTML = escaped`
         <div class="userContext-icon-wrapper open-newtab">
           <div class="usercontext-icon"
@@ -683,7 +685,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
       tr.classList.add("container-info-tab-row");
       tr.innerHTML = escaped`
         <td></td>
-        <td class="container-info-tab-title truncate-text">${tab.title}</td>`;
+        <td class="container-info-tab-title truncate-text" title="${tab.url}" >${tab.title}</td>`;
       tr.querySelector("td").appendChild(Utils.createFavIconElement(tab.favicon));
 
       // On click, we activate this tab. But only if this tab is active.
@@ -741,15 +743,15 @@ Logic.registerPanel(P_CONTAINERS_EDIT, {
             src="/img/container-edit.svg"
             class="pop-button-image" />
         </td>
-        <td class="remove-container pop-button delete-container-icon" >
+        <td class="remove-container pop-button delete-container-icon">
           <img
             class="pop-button-image"
             src="/img/container-delete.svg"
           />
         </td>`;
       tr.querySelector(".container-name").textContent = identity.name;
-      tr.querySelector(".edit-container .pop-button-image").setAttribute("title", `Edit ${identity.name} container`);
-      tr.querySelector(".remove-container .pop-button-image").setAttribute("title", `Edit ${identity.name} container`);
+      tr.querySelector(".edit-container").setAttribute("title", `Edit ${identity.name} container`);
+      tr.querySelector(".remove-container").setAttribute("title", `Delete ${identity.name} container`);
 
 
       Logic.addEnterHandler(tr, e => {
diff --git a/webextension/popup.html b/webextension/popup.html
index 40e52e1..bfca0ec 100644
--- a/webextension/popup.html
+++ b/webextension/popup.html
@@ -73,7 +73,7 @@
       </label>
     </div>
     <div class="container-panel-controls">
-      <a href="#" class="action-link" id="sort-containers-link">Sort Tabs</a>
+      <a href="#" class="action-link" id="sort-containers-link" title="Sort tabs into container order">Sort Tabs</a>
     </div>
     <div class="scrollable panel-content" tabindex="-1">
       <table class="identities-list">
@@ -84,8 +84,8 @@
       <div class="edit-containers-text panel-footer-secondary">
         <a href="#" tabindex="0" id="edit-containers-link">Edit Containers</a>
       </div>
-      <a href="#" tabindex="0" class="add-container-link pop-button" id="container-add-link">
-        <img class="pop-button-image-small icon" alt="Create new container icon" title="Create new container" src="/img/container-add.svg" />
+      <a href="#" tabindex="0" class="add-container-link pop-button" id="container-add-link" title="Create new container">
+        <img class="pop-button-image-small icon" alt="Create new container icon" src="/img/container-add.svg" />
       </a>
     </div>
   </div>