diff --git a/src/dorkbox/systemTray/nativeUI/AwtMenuItem.java b/src/dorkbox/systemTray/nativeUI/AwtMenuItem.java
index f04b2fb..b4385fc 100644
--- a/src/dorkbox/systemTray/nativeUI/AwtMenuItem.java
+++ b/src/dorkbox/systemTray/nativeUI/AwtMenuItem.java
@@ -28,7 +28,7 @@ class AwtMenuItem implements MenuItemPeer {
     private final AwtMenu parent;
     private final java.awt.MenuItem _native = new java.awt.MenuItem();
 
-    private volatile ActionListener swingCallback;
+    private volatile ActionListener callback;
 
     // this is ALWAYS called on the EDT.
     AwtMenuItem(final AwtMenu parent) {
@@ -70,12 +70,12 @@ class AwtMenuItem implements MenuItemPeer {
     @Override
     public
     void setCallback(final dorkbox.systemTray.MenuItem menuItem) {
-        if (swingCallback != null) {
-            _native.removeActionListener(swingCallback);
+        if (callback != null) {
+            _native.removeActionListener(callback);
         }
 
         if (menuItem.getCallback() != null) {
-            swingCallback = new ActionListener() {
+            callback = new ActionListener() {
                 @Override
                 public
                 void actionPerformed(ActionEvent e) {
@@ -91,10 +91,10 @@ class AwtMenuItem implements MenuItemPeer {
                 }
             };
 
-            _native.addActionListener(swingCallback);
+            _native.addActionListener(callback);
         }
         else {
-            swingCallback = null;
+            callback = null;
         }
     }
 
@@ -125,9 +125,9 @@ class AwtMenuItem implements MenuItemPeer {
                 _native.deleteShortcut();
                 _native.setEnabled(false);
 
-                if (swingCallback != null) {
-                    _native.removeActionListener(swingCallback);
-                    swingCallback = null;
+                if (callback != null) {
+                    _native.removeActionListener(callback);
+                    callback = null;
                 }
                 parent._native.remove(_native);
 
diff --git a/src/dorkbox/systemTray/nativeUI/GtkMenu.java b/src/dorkbox/systemTray/nativeUI/GtkMenu.java
index fe910bb..92058de 100644
--- a/src/dorkbox/systemTray/nativeUI/GtkMenu.java
+++ b/src/dorkbox/systemTray/nativeUI/GtkMenu.java
@@ -16,7 +16,6 @@
 package dorkbox.systemTray.nativeUI;
 
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -34,7 +33,7 @@ import dorkbox.systemTray.peer.MenuPeer;
 @SuppressWarnings("deprecation")
 class GtkMenu extends GtkBaseMenuItem implements MenuPeer {
     // this is a list (that mirrors the actual list) BECAUSE we have to create/delete the entire menu in GTK every time something is changed
-    private final List<GtkBaseMenuItem> menuEntries = new LinkedList<GtkBaseMenuItem>();
+    private final List<GtkBaseMenuItem> menuEntries = new ArrayList<GtkBaseMenuItem>();
 
     private final GtkMenu parent;
     volatile Pointer _nativeMenu;  // must ONLY be created at the end of delete!
@@ -69,18 +68,6 @@ class GtkMenu extends GtkBaseMenuItem implements MenuPeer {
         return parent;
     }
 
-    /**
-     * ALWAYS CALLED ON THE EDT
-     */
-    private
-    void add(final GtkBaseMenuItem item, final int index) {
-        if (index > 0) {
-            menuEntries.add(index, item);
-        } else {
-            menuEntries.add(item);
-        }
-    }
-
     /**
      * Called inside the gdk_threads block
      *
@@ -221,27 +208,27 @@ class GtkMenu extends GtkBaseMenuItem implements MenuPeer {
                     // some implementations of appindicator, do NOT like having a menu added, which has no menu items yet.
                     // see: https://bugs.launchpad.net/glipper/+bug/1203888
                     GtkMenu item = new GtkMenu(GtkMenu.this);
-                    add(item, index);
+                    menuEntries.add(index, item);
                     ((Menu) entry).bind(item, parentMenu, parentMenu.getSystemTray());
                 }
                 else if (entry instanceof Separator) {
                     GtkMenuItemSeparator item = new GtkMenuItemSeparator(GtkMenu.this);
-                    add(item, index);
+                    menuEntries.add(index, item);
                     entry.bind(item, parentMenu, parentMenu.getSystemTray());
                 }
                 else if (entry instanceof Checkbox) {
                     GtkMenuItemCheckbox item = new GtkMenuItemCheckbox(GtkMenu.this);
-                    add(item, index);
+                    menuEntries.add(index, item);
                     ((Checkbox) entry).bind(item, parentMenu, parentMenu.getSystemTray());
                 }
                 else if (entry instanceof Status) {
                     GtkMenuItemStatus item = new GtkMenuItemStatus(GtkMenu.this);
-                    add(item, index);
+                    menuEntries.add(index, item);
                     ((Status) entry).bind(item, parentMenu, parentMenu.getSystemTray());
                 }
                 else if (entry instanceof MenuItem) {
                     GtkMenuItem item = new GtkMenuItem(GtkMenu.this);
-                    add(item, index);
+                    menuEntries.add(index, item);
                     ((MenuItem) entry).bind(item, parentMenu, parentMenu.getSystemTray());
                 }