diff --git a/background.js b/background.js
index a9c5ef8..a33956c 100644
--- a/background.js
+++ b/background.js
@@ -23,8 +23,13 @@ let port = null;
 api.runtime.onConnect.addListener(p => {
   console.log('port connected');
   port = p;
+  onEscapeWindowConnected();
 });
 
+const onEscapeWindowConnected = () => {
+  console.log('OEW');
+};
+
 // Listen for ESC from web content
 function escapeHandler(message) {
 	if (message.ESC === 1) {
diff --git a/home.js b/home.js
index fad0363..f84adb5 100644
--- a/home.js
+++ b/home.js
@@ -174,6 +174,7 @@ function getGroupById(id) {
 }
 
 function activateGroup(groupId) {
+  console.log('activateGroup', groupId);
   const group = getGroupById(groupId);
   const lastGroup = getGroupById(config.lastGroupId);
 
@@ -241,7 +242,7 @@ function initializeGroupData() {
 
 const newGroup = async (title) => {
   console.log('newGroup', title);
-  var id = window.crypto.getRandomValues(new Uint32Array(1))[0];
+  const id = Math.random().toString(16).slice(2);
   var group = {
     id: id,
     title: title || 'New Group',
@@ -258,14 +259,13 @@ function showGroups() {
   for (let id in config.groups) {
     var group = config.groups[id];
     var card = addCard();
-    console.log('GROUP', group.title);
     card.querySelector('h1').innerText = group.title;
     card.dataset.id = group.id;
     card.addEventListener('click', e => {
-      var groupId = parseInt(card.dataset.id);
-      if (groupId != config.lastGroupId) {
+      const groupId = card.dataset.id;
+      //if (groupId != config.lastGroupId) {
         activateGroup(groupId);
-      }
+      //}
     });
     card.classList.add('group');
   }
@@ -275,7 +275,7 @@ function showGroups() {
 }
 
 function showTabs() {
-  var group = getGroupById(config.lastGroupId);
+  const group = getGroupById(config.lastGroupId);
   clearCards();
   api.tabs.query({currentWindow: true}).then(function(tabs) {
     tabs.forEach(tab => {
@@ -297,9 +297,9 @@ function showTabs() {
 }
 
 function clearCards() {
-  var container = document.querySelector('.cards');
+  const container = document.querySelector('.cards');
   Array.prototype.slice.call(container.children).forEach(child => {
-    child.parentNode.removeChild(child);
+    container.removeChild(child);
   });
 }