diff --git a/config/_file_loader.lua b/config/_file_loader.lua
index 10bd035a..eb9ce62c 100644
--- a/config/_file_loader.lua
+++ b/config/_file_loader.lua
@@ -63,12 +63,12 @@ return {
     'modules.gui.readme',
     'modules.gui.rocket-info',
     'modules.gui.science-info',
+    'modules.gui.autofill',
     'modules.gui.warp-list',
     'modules.gui.task-list',
     'modules.gui.player-list',
     'modules.gui.server-ups',
     'modules.commands.debug',
-    'modules.gui.autofill',
 
     --- Config Files
     'config.expcore.command_auth_admin', -- commands tagged with admin_only are blocked for non admins
diff --git a/modules/gui/autofill.lua b/modules/gui/autofill.lua
index f89a8c98..c27e962b 100644
--- a/modules/gui/autofill.lua
+++ b/modules/gui/autofill.lua
@@ -85,6 +85,11 @@ end)
         element.sprite = 'utility/confirm_slot'
         element.style = 'shortcut_bar_button_green'
     end
+    -- Correct the button size
+    local style = element.style
+    style.padding = -2
+    style.height = 22
+    style.width = 22
 end)
 
 --- Draw a section header and main scroll
diff --git a/modules/gui/task-list.lua b/modules/gui/task-list.lua
index 276a1c3f..03ccd65d 100644
--- a/modules/gui/task-list.lua
+++ b/modules/gui/task-list.lua
@@ -219,7 +219,7 @@ local task_list =
         }
         scroll_pane.style.horizontally_stretchable = true
         scroll_pane.style.padding = 0
-        scroll_pane.style.maximal_height = 280
+        scroll_pane.style.maximal_height = 224
 
         local flow =
             scroll_pane.add {
@@ -572,12 +572,6 @@ local update_task = function(player, task_list_element, task_id)
     element[task_list_item.name].tooltip = {"task-list.last-edit", last_edit_name, format_time(last_edit_time)}
 end
 
---- Button on the top flow used to toggle the task list container
--- @element toggle_task_list
-Gui.left_toolbar_button('utility/not_enough_repair_packs_icon', {'task-list.main-tooltip'}, task_list_container, function(player)
-    return Roles.player_allowed(player, 'gui/task-list')
-end)
-
 -- Update the footer task edit view
 local update_task_edit_footer = function(player, task_id)
     local task = Tasks.get_task(task_id)
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index 69607dcb..e95e4589 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -616,6 +616,7 @@ local function update_all_warp_force(force)
         local frame = Gui.get_left_element(player, warp_list_container)
         local warp_table = frame.container.scroll.table
 
+        warp_table.clear() -- Needed to re-sort the warps
         for _, warp_id in ipairs(warp_ids) do
             update_warp(player, warp_table, warp_id)
         end