diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index aaf2de4..6353709 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -215,7 +215,7 @@ function showDeleteContainerPanel(identity) {
   showPanel("#delete-container-panel");
 }
 
-document.querySelector("#add-container-link").addEventListener("click", () => {
+document.querySelector(".add-container-link").addEventListener("click", () => {
   showPanel("#edit-container-panel");
 });
 
@@ -235,10 +235,6 @@ document.querySelector("#edit-container-cancel-link").addEventListener("click",
   showEditContainersPanel();
 });
 
-document.querySelector("#delete-container-panel-back-arrow").addEventListener("click", () => {
-  showEditContainersPanel();
-});
-
 document.querySelector("#delete-container-cancel-link").addEventListener("click", () => {
   showEditContainersPanel();
 });
@@ -252,7 +248,6 @@ document.querySelector("#sort-containers-link").addEventListener("click", () =>
 });
 
 document.querySelector("#close-container-info-panel").addEventListener("click", () => {
-  // TODO: animation
   document.getElementById("container-info-panel").classList.add("hide");
   document.getElementById("container-panel").classList.remove("hide");
 });
diff --git a/webextension/popup.html b/webextension/popup.html
index 9316540..9fd8beb 100644
--- a/webextension/popup.html
+++ b/webextension/popup.html
@@ -41,7 +41,7 @@
         <a id="edit-containers-link">Edit Containers</a>
       </div>
       <div class="small-2 columns add-container">
-        <a id="add-container-link">
+        <a class="add-container-link">
           <img alt="Create new container icon" title="Create new container" src="/img/container-add.svg" class="icon" />
         </a>
       </div>
@@ -84,7 +84,7 @@
         <a id="exit-edit-mode-link">&lt; Exit Edit Mode</a>
       </div>
       <div class="small-2 columns add-container">
-        <a id="add-container-link">
+        <a class="add-container-link">
           <img alt="Create new container icon" title="Create new container" src="/img/container-add.svg" class="icon" />
         </a>
       </div>