diff --git a/webextension/css/popup.css b/webextension/css/popup.css
index 2ce5d91..9f4a8e0 100644
--- a/webextension/css/popup.css
+++ b/webextension/css/popup.css
@@ -2,12 +2,21 @@ body {
   background: #FAFAFA;
   min-inline-size: 200px;
   max-inline-size: 400px;
+  inline-size: 264px;
 }
 
 table {
   margin-block-end: 0;
 }
 
+.panel {
+  height: 100%;
+}
+
+.panel-row {
+  height: 100%;
+}
+
 .onboarding {
   margin: 16px;
   min-block-size: 480px;
@@ -35,14 +44,26 @@ table {
   padding: .5em;
 }
 
-.header-column {
-  padding: 0;
+.panel-header {
+  height: 54px;
+  display: flex;
+  align-items: center;
+}
+
+.panel-header-text {
+  font-weight: lighter;
+  font-size: 16px;
+  margin-bottom: 0;
+  color: #4a4a4a;
+}
+
+.panel-header-button {
+  justify-content: center;
 }
 
 .icon {
   max-inline-size: 16px;
   block-size: 16px;
-  margin: 4px;
 }
 
 .container-panel > table.unstriped tbody tr {
@@ -71,9 +92,19 @@ table {
   background: #DCDBDC;
 }
 
+.panel-footer {
+  align-items: center;
+  background: #efefef;
+  color: #000000;
+  display: flex;
+  font-size: 13px;
+  height: 54px;
+  width: 100%;
+}
+
 .edit-containers-text {
   text-align: center;
-  padding: .5em;
+  border-right: solid 1px #d8d8d8;
 }
 
 .edit-containers-text a {
@@ -143,3 +174,13 @@ table {
 .container-info-has-tabs {
   cursor: pointer;
 }
+
+.edit-panel-footer {
+  background: #248aeb;
+  color: #ffffff;
+  justify-content: center;
+}
+
+.edit-panel-footer a {
+  color: #ffffff;
+}
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index 278eeb3..b03ee03 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -130,12 +130,13 @@ browser.runtime.sendMessage({method: "queryIdentities"}).then(identities => {
 });
 
 document.querySelector("#edit-containers-link").addEventListener("click", () => {
-  browser.runtime.sendMessage({
-    method: "openTab",
-    url: "about:preferences#containers"
-  }).then(() => {
-    window.close();
-  });
+  document.querySelector("#container-panel").classList.add("hide");
+  document.querySelector("#edit-panel").classList.remove("hide");
+});
+
+document.querySelector("#exit-edit-mode-link").addEventListener("click", () => {
+  document.querySelector("#container-panel").classList.remove("hide");
+  document.querySelector("#edit-panel").classList.add("hide");
 });
 
 document.querySelector("#sort-containers-link").addEventListener("click", () => {
diff --git a/webextension/popup.html b/webextension/popup.html
index 5bd8dfc..b03efd2 100644
--- a/webextension/popup.html
+++ b/webextension/popup.html
@@ -6,6 +6,7 @@
   <link rel="stylesheet" href="/css/popup.css">
 </head>
 <body>
+
   <div class="panel onboarding onboarding-panel-1" id="onboarding-panel-1">
     <img alt="Container Tabs Overview" src="/img/onboarding-1.png" />
     <h3>A better way to manage all the things you do online</h3>
@@ -13,33 +14,54 @@
     <p class="spacing" ><a href="#">Learn more</a></p>
     <a href="#" id="onboarding-next-button" class="button expanded">Next</a>
   </div>
+
+
   <div class="panel onboarding onboarding-panel-2" id="onboarding-panel-2">
     <img alt="How Containers Work" src="/img/onboarding-2.png" />
     <h3>Put containers to work for you.</h3>
     <p>Features like color-coding and separate container tabs help you find things easily, focus your attention, and minimize distractions.</p>
     <a href="#" id="onboarding-done-button" class="button expanded spacing">Done</a>
   </div>
+
+
   <div class="panel container-panel" id="container-panel">
-    <div class="row popup-bumper">
-      <div class="small-2 columns header-column">
-        <img alt="Containers icon" class="icon" src="/img/container-site-d-24.png">
+    <div class="row panel-header">
+      <div class="small-10 columns">
+        <h3 class="panel-header-text">Containers</h3>
       </div>
-      <div class="small-8 columns">
-        <h4>Containers</h4>
-      </div>
-      <div class="small-2 columns header-column">
+      <div class="small-2 columns panel-header-button">
         <a id="sort-containers-link"><img alt="Sort Containers" title="Sort Containers" class="icon" src="/img/container-sort.svg"></a>
       </div>
     </div>
     <table class="unstriped hover">
       <tbody class="identities-list"></tbody>
     </table>
-    <div class="row popup-bumper edit-identities">
-      <div class="small-12 columns edit-containers-text">
-        <a id="edit-containers-link" href="about:preferences#containers">Edit Containers</a>
+    <div class="row panel-footer edit-identities">
+      <div class="small-10 columns edit-containers-text">
+        <a id="edit-containers-link">Edit Containers</a>
+      </div>
+      <div class="small-2 columns add-container">
+        &plus;
       </div>
     </div>
   </div>
+
+
+  <div class="panel edit-panel hide" id="edit-panel">
+    <div class="row panel-header">
+      <div class="small-12 columns">
+        <h3 class="panel-header-text">Edit Containers</h3>
+      </div>
+    </div>
+    <table class="unstriped hover">
+      <tbody class="edit-identities-list"></tbody>
+    </table>
+    <div class="row panel-footer edit-panel-footer">
+      <a id="exit-edit-mode-link">&lt; Exit Edit Mode</a>
+    </div>
+  </div>
+
+
   <div class="hide panel container-info-panel" id="container-info-panel">
     <div class="row popup-bumper">
       <div class="small-1 columns" id="close-container-info-panel">&lt;</div>
@@ -63,6 +85,8 @@
       </div>
     </div>
   </div>
+
+
   <script src="js/popup.js"></script>
 </body>
 </html>
