diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index 78d25ba14..4647ed4d3 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -1807,6 +1807,9 @@
         menu = this.makeMenu();
         currentMenu = menu;
         lastToggledButton = button;
+        this.entries.sort(function(first, second) {
+          return first.order - second.order;
+        });
         _ref = this.entries;
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
           entry = _ref[_i];
@@ -3292,7 +3295,7 @@
         return $.event('AddMenuEntry', {
           type: 'header',
           el: el,
-          order: 80,
+          order: 105,
           subEntries: subEntries
         });
       },
@@ -8332,7 +8335,7 @@
       return true;
     },
     toggle: function() {
-      var container, containers, node, nodes, replies, reply, thread, _i, _j, _k, _len, _len1, _len2;
+      var container, containers, node, nodes, replies, reply, thread, _i, _j, _len, _len1;
 
       thread = $('.thread');
       replies = $$('.thread > .replyContainer, .threadContainer > .replyContainer', thread);
@@ -8350,10 +8353,6 @@
         })();
         for (_i = 0, _len = nodes.length; _i < _len; _i++) {
           node = nodes[_i];
-          Unread.node.call(node);
-        }
-        for (_j = 0, _len1 = nodes.length; _j < _len1; _j++) {
-          node = nodes[_j];
           QuoteThreading.node(node);
         }
       } else {
@@ -8366,8 +8365,8 @@
         });
         $.add(thread, replies);
         containers = $$('.threadContainer', thread);
-        for (_k = 0, _len2 = containers.length; _k < _len2; _k++) {
-          container = containers[_k];
+        for (_j = 0, _len1 = containers.length; _j < _len1; _j++) {
+          container = containers[_j];
           $.rm(container);
         }
         Unread.update(true);
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 8cc52cf50..83ac9eb49 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1798,6 +1798,9 @@
         menu = this.makeMenu();
         currentMenu = menu;
         lastToggledButton = button;
+        this.entries.sort(function(first, second) {
+          return first.order - second.order;
+        });
         _ref = this.entries;
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
           entry = _ref[_i];
@@ -3283,7 +3286,7 @@
         return $.event('AddMenuEntry', {
           type: 'header',
           el: el,
-          order: 80,
+          order: 105,
           subEntries: subEntries
         });
       },
@@ -8348,7 +8351,7 @@
       return true;
     },
     toggle: function() {
-      var container, containers, node, nodes, replies, reply, thread, _i, _j, _k, _len, _len1, _len2;
+      var container, containers, node, nodes, replies, reply, thread, _i, _j, _len, _len1;
 
       thread = $('.thread');
       replies = $$('.thread > .replyContainer, .threadContainer > .replyContainer', thread);
@@ -8366,10 +8369,6 @@
         })();
         for (_i = 0, _len = nodes.length; _i < _len; _i++) {
           node = nodes[_i];
-          Unread.node.call(node);
-        }
-        for (_j = 0, _len1 = nodes.length; _j < _len1; _j++) {
-          node = nodes[_j];
           QuoteThreading.node(node);
         }
       } else {
@@ -8382,8 +8381,8 @@
         });
         $.add(thread, replies);
         containers = $$('.threadContainer', thread);
-        for (_k = 0, _len2 = containers.length; _k < _len2; _k++) {
-          container = containers[_k];
+        for (_j = 0, _len1 = containers.length; _j < _len1; _j++) {
+          container = containers[_j];
           $.rm(container);
         }
         Unread.update(true);
diff --git a/builds/crx.crx b/builds/crx.crx
index 5d3eb0a8a..db11ff996 100644
Binary files a/builds/crx.crx and b/builds/crx.crx differ
diff --git a/builds/crx/script.js b/builds/crx/script.js
index e808f78c1..c1f83415d 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1721,6 +1721,9 @@
         menu = this.makeMenu();
         currentMenu = menu;
         lastToggledButton = button;
+        this.entries.sort(function(first, second) {
+          return first.order - second.order;
+        });
         _ref = this.entries;
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
           entry = _ref[_i];
@@ -3206,7 +3209,7 @@
         return $.event('AddMenuEntry', {
           type: 'header',
           el: el,
-          order: 80,
+          order: 105,
           subEntries: subEntries
         });
       },
@@ -8252,7 +8255,7 @@
       return true;
     },
     toggle: function() {
-      var container, containers, node, nodes, replies, reply, thread, _i, _j, _k, _len, _len1, _len2;
+      var container, containers, node, nodes, replies, reply, thread, _i, _j, _len, _len1;
 
       thread = $('.thread');
       replies = $$('.thread > .replyContainer, .threadContainer > .replyContainer', thread);
@@ -8270,10 +8273,6 @@
         })();
         for (_i = 0, _len = nodes.length; _i < _len; _i++) {
           node = nodes[_i];
-          Unread.node.call(node);
-        }
-        for (_j = 0, _len1 = nodes.length; _j < _len1; _j++) {
-          node = nodes[_j];
           QuoteThreading.node(node);
         }
       } else {
@@ -8286,8 +8285,8 @@
         });
         $.add(thread, replies);
         containers = $$('.threadContainer', thread);
-        for (_k = 0, _len2 = containers.length; _k < _len2; _k++) {
-          container = containers[_k];
+        for (_j = 0, _len1 = containers.length; _j < _len1; _j++) {
+          container = containers[_j];
           $.rm(container);
         }
         Unread.update(true);
diff --git a/src/features/imaging/imageexpand.coffee b/src/features/imaging/imageexpand.coffee
index 003c64c7d..240839fbd 100644
--- a/src/features/imaging/imageexpand.coffee
+++ b/src/features/imaging/imageexpand.coffee
@@ -171,7 +171,7 @@ ImageExpand =
       $.event 'AddMenuEntry',
         type: 'header'
         el: el
-        order: 80
+        order: 105
         subEntries: subEntries
 
     createSubEntry: (type, config) ->
diff --git a/src/features/quoting/quotethreading.coffee b/src/features/quoting/quotethreading.coffee
index 96e6f60e2..e2e859ae3 100644
--- a/src/features/quoting/quotethreading.coffee
+++ b/src/features/quoting/quotethreading.coffee
@@ -89,7 +89,6 @@ QuoteThreading =
     QuoteThreading.enabled = @checked
     if @checked
       nodes = (Get.postFromNode reply for reply in replies)
-      Unread.node.call    node for node in nodes
       QuoteThreading.node node for node in nodes
     else
       replies.sort (a, b) ->
diff --git a/src/lib/ui.coffee b/src/lib/ui.coffee
index c072a3be6..b2fff3393 100644
--- a/src/lib/ui.coffee
+++ b/src/lib/ui.coffee
@@ -54,6 +54,9 @@ UI = do ->
       menu = @makeMenu()
       currentMenu       = menu
       lastToggledButton = button
+      
+      @entries.sort (first, second) ->
+        first.order - second.order
 
       for entry in @entries
         @insertEntry entry, menu, data