diff --git a/app/bt.css b/app/bt.css
index cb5ad90..7992368 100644
--- a/app/bt.css
+++ b/app/bt.css
@@ -35,6 +35,10 @@
     --btFootnoteFontWeight: 400;
     --btFootnoteLineHeight: 12px;
 
+    --btWenkBottom: 8px;
+    --btWenkPadding:  0.2rem 0.5rem 0.2rem 0.5rem;
+    --btIndentStepSize: 30px;
+
     --btSettingsSubtextFontSize: 10px;
     --btSettingsSubtextFontWeight: 400;
     --btSettingsSubtextLineHeight: 12px;
@@ -155,6 +159,10 @@
     --btIndenterTopOffset: -4px;
     --btFaviconPadding: 1px;
     --btTabgroupPadding: 3px 7px 3px 7px !important;
+
+    --btWenkBottom: 3px;
+    --btWenkPadding: 0.1rem 0.5rem 0.1rem 0.5rem;
+    --btIndentStepSize: 20px;
 }
 
 [data-size="LARGE"] {
diff --git a/app/bt.js b/app/bt.js
index 92bbac3..07254e1 100644
--- a/app/bt.js
+++ b/app/bt.js
@@ -194,6 +194,9 @@ function handleInitialTabs(tabs, tgs) {
             node.tabGroupId = tab.groupId;
             const tg = tgs.find(tg => tg.id == tab.groupId);
             if (tg) node.setTGColor(tg.color);
+        } else {
+            node.putInGroup();                              // not grouped currently, handle creating/assigning as needed on startup
+            node.groupAndPosition();
         }
         if (node.parentId && AllNodes[node.parentId]) {
             AllNodes[node.parentId].windowId = node.windowId;
@@ -971,7 +974,7 @@ function tabJoinedTG(data) {
     const tgId = data.groupId;
     let tabNode = BTAppNode.findFromTab(tabId);
     const topicNode = BTAppNode.findFromGroup(tgId);
-    if (tabNode || !topicNode) return;                              // n/a || don't care
+    if (tabNode || !topicNode || (GroupingMode != 'TABGROUP')) return;                              // n/a || don't care
     const tab = data.tab;
     const index = data.tabIndex;
     const indices = data.tabIndices;
@@ -994,7 +997,8 @@ function tabLeftTG(data) {
     
     const tabId = data.tabId;
     const tabNode = BTAppNode.findFromTab(tabId);
-    if (tabNode) deleteNode(tabNode.id);
+    if (!tabNode || (GroupingMode != 'TABGROUP')) return;
+    deleteNode(tabNode.id);
 }
 
 function tabMoved(data) {
diff --git a/app/jquery.treetable.js b/app/jquery.treetable.js
index bf85bf8..ec77a00 100644
--- a/app/jquery.treetable.js
+++ b/app/jquery.treetable.js
@@ -248,7 +248,8 @@
         // Tony Edit: shift siblings of parents left so all a parents children are equal,
         // also, remove indenter if no longer applicible
         //if (this.isBranchNode())
-            this.indenter[0].style.paddingLeft = "" + (this.level() * settings.indent) + "px";
+            //this.indenter[0].style.paddingLeft = "" + (this.level() * settings.indent) + "px";
+            this.indenter[0].style.paddingLeft = "calc(var(--btIndentStepSize) * " + this.level() + ")";
         //else {          
           //  this.indenter[0].style.paddingLeft = "" + ((this.level() - 1) * settings.indent) + "px";
             //$(this.indenter[0]).empty();
diff --git a/app/wenk.css b/app/wenk.css
index 11e5655..cd9c663 100644
--- a/app/wenk.css
+++ b/app/wenk.css
@@ -15,7 +15,7 @@
     font-size: var(--btTopicFontSize);
     border-radius: .2rem;
     content: attr(data-wenk);
-    padding: .4rem;
+    padding: var(--btWenkPadding);
     background-color:  var(--btTooltipBackground);
     color: var(--btTooltipForeground);
     line-height: 1.25rem;
@@ -82,7 +82,7 @@
 
 /* used for the ttree expand/collapse buttons */
 [data-wenk].wenk--bottom:after {
-    bottom: 5px;
+    bottom: var(--btWenkBottom);
     left: 100%;
     top: auto;
     right: auto;
diff --git a/versions/Release-Candidate/app/bt.css b/versions/Release-Candidate/app/bt.css
index cb5ad90..7992368 100644
--- a/versions/Release-Candidate/app/bt.css
+++ b/versions/Release-Candidate/app/bt.css
@@ -35,6 +35,10 @@
     --btFootnoteFontWeight: 400;
     --btFootnoteLineHeight: 12px;
 
+    --btWenkBottom: 8px;
+    --btWenkPadding:  0.2rem 0.5rem 0.2rem 0.5rem;
+    --btIndentStepSize: 30px;
+
     --btSettingsSubtextFontSize: 10px;
     --btSettingsSubtextFontWeight: 400;
     --btSettingsSubtextLineHeight: 12px;
@@ -155,6 +159,10 @@
     --btIndenterTopOffset: -4px;
     --btFaviconPadding: 1px;
     --btTabgroupPadding: 3px 7px 3px 7px !important;
+
+    --btWenkBottom: 3px;
+    --btWenkPadding: 0.1rem 0.5rem 0.1rem 0.5rem;
+    --btIndentStepSize: 20px;
 }
 
 [data-size="LARGE"] {
diff --git a/versions/Release-Candidate/app/bt.js b/versions/Release-Candidate/app/bt.js
index 92bbac3..07254e1 100644
--- a/versions/Release-Candidate/app/bt.js
+++ b/versions/Release-Candidate/app/bt.js
@@ -194,6 +194,9 @@ function handleInitialTabs(tabs, tgs) {
             node.tabGroupId = tab.groupId;
             const tg = tgs.find(tg => tg.id == tab.groupId);
             if (tg) node.setTGColor(tg.color);
+        } else {
+            node.putInGroup();                              // not grouped currently, handle creating/assigning as needed on startup
+            node.groupAndPosition();
         }
         if (node.parentId && AllNodes[node.parentId]) {
             AllNodes[node.parentId].windowId = node.windowId;
@@ -971,7 +974,7 @@ function tabJoinedTG(data) {
     const tgId = data.groupId;
     let tabNode = BTAppNode.findFromTab(tabId);
     const topicNode = BTAppNode.findFromGroup(tgId);
-    if (tabNode || !topicNode) return;                              // n/a || don't care
+    if (tabNode || !topicNode || (GroupingMode != 'TABGROUP')) return;                              // n/a || don't care
     const tab = data.tab;
     const index = data.tabIndex;
     const indices = data.tabIndices;
@@ -994,7 +997,8 @@ function tabLeftTG(data) {
     
     const tabId = data.tabId;
     const tabNode = BTAppNode.findFromTab(tabId);
-    if (tabNode) deleteNode(tabNode.id);
+    if (!tabNode || (GroupingMode != 'TABGROUP')) return;
+    deleteNode(tabNode.id);
 }
 
 function tabMoved(data) {
diff --git a/versions/Release-Candidate/app/jquery.treetable.js b/versions/Release-Candidate/app/jquery.treetable.js
index bf85bf8..ec77a00 100644
--- a/versions/Release-Candidate/app/jquery.treetable.js
+++ b/versions/Release-Candidate/app/jquery.treetable.js
@@ -248,7 +248,8 @@
         // Tony Edit: shift siblings of parents left so all a parents children are equal,
         // also, remove indenter if no longer applicible
         //if (this.isBranchNode())
-            this.indenter[0].style.paddingLeft = "" + (this.level() * settings.indent) + "px";
+            //this.indenter[0].style.paddingLeft = "" + (this.level() * settings.indent) + "px";
+            this.indenter[0].style.paddingLeft = "calc(var(--btIndentStepSize) * " + this.level() + ")";
         //else {          
           //  this.indenter[0].style.paddingLeft = "" + ((this.level() - 1) * settings.indent) + "px";
             //$(this.indenter[0]).empty();
diff --git a/versions/Release-Candidate/app/wenk.css b/versions/Release-Candidate/app/wenk.css
index 11e5655..cd9c663 100644
--- a/versions/Release-Candidate/app/wenk.css
+++ b/versions/Release-Candidate/app/wenk.css
@@ -15,7 +15,7 @@
     font-size: var(--btTopicFontSize);
     border-radius: .2rem;
     content: attr(data-wenk);
-    padding: .4rem;
+    padding: var(--btWenkPadding);
     background-color:  var(--btTooltipBackground);
     color: var(--btTooltipForeground);
     line-height: 1.25rem;
@@ -82,7 +82,7 @@
 
 /* used for the ttree expand/collapse buttons */
 [data-wenk].wenk--bottom:after {
-    bottom: 5px;
+    bottom: var(--btWenkBottom);
     left: 100%;
     top: auto;
     right: auto;