diff --git a/dist/manifest.json b/dist/manifest.json
index f82a1b2..021fa69 100644
--- a/dist/manifest.json
+++ b/dist/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "inboxy: Inbox Bundles for Gmail",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "description": "Adds Google Inbox bundles to Gmail",
     "homepage_url": "https://www.inboxymail.com",
     "background": {
diff --git a/dist/style.css b/dist/style.css
index 2ebbf36..bd06eec 100644
--- a/dist/style.css
+++ b/dist/style.css
@@ -70,9 +70,20 @@ html.inboxy.dark-theme .bundle-row.zE.visible {
     text-shadow: 0 1px 2px rgba(0, 0, 0, 0.65);
 }
 
+html.inboxy .bundle-row.visible {
+    flex-wrap: nowrap;
+}
+
 html.inboxy .bundle-row.visible .xY.yX {
     font-size: 1.025rem;
     margin-left: 56px;
+    /* Truncate for reading pane view. See #36. */
+    max-width: calc(100% - 220px);
+}
+
+html.inboxy .bundle-row.visible .bundle-and-count {
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 /* Handle long label names */
@@ -83,15 +94,16 @@ html.inboxy .bundle-row:not(.visible) .xY {
     align-items: flex-start;
     height: unset;
 }
-/* Allow more width before wrapping */
+/* Allow more width before wrapping (#11), but not too much so that #36 happens */
 html.inboxy .bundle-row:not(.visible) .xY.yX {
     padding-right: 12px;
-    flex-basis: 188px;
-    max-width: 188px;
+    flex-basis: 180px;
+    max-width: 180px;
 }
 
 html.inboxy .bundle-row.visible .bundle-date-cell,
-html.inboxy .bundle-row.visible .bundle-senders {
+/* .bundle-senders parent */
+html.inboxy .bundle-row.visible .a4W { 
     display: none;
 }
 
diff --git a/src/bundling/Bundler.js b/src/bundling/Bundler.js
index 620c43c..b1eb440 100644
--- a/src/bundling/Bundler.js
+++ b/src/bundling/Bundler.js
@@ -59,7 +59,9 @@ class Bundler {
     bundleMessages(reopenRecentBundle) {
         const bundledMail = this.bundledMail;
         const possibleMessageLists = document.querySelectorAll(Selectors.POSSIBLE_MESSAGE_LISTS);
-        const messageList = possibleMessageLists.length ? possibleMessageLists.item(1) : null;
+        const messageList = possibleMessageLists.length 
+            ? possibleMessageLists.item(possibleMessageLists.length - 1) 
+            : null;
 
         if (!messageList) {
             return;
diff --git a/src/components/BundleRow.js b/src/components/BundleRow.js
index 7306388..f1c5025 100644
--- a/src/components/BundleRow.js
+++ b/src/components/BundleRow.js
@@ -78,7 +78,10 @@ function create(label, order, messages, hasUnread, toggleBundle, baseUrl) {
     const bulkArchiveTd = DomUtils.htmlToElement(`<td class="${GmailClasses.CELL}"></td>`);
     bulkArchiveTd.appendChild(bulkArchiveButton);
 
-    const labelUrl = label.split(' ').join('+').split('/').join('%2F');
+    const labelUrl = label
+        .split(' ').join('-')
+        .split('/').join('%2F')
+        .split('&').join('-');
     const url = `${baseUrl}#search/label%3AInbox+label%3A${labelUrl}`;
     const viewAllButtonHtml = `
         <td class="${GmailClasses.CELL}">