diff --git a/src/app/editor/graphics/palette_editor.cc b/src/app/editor/graphics/palette_editor.cc
index 51061aa2..4d49041b 100644
--- a/src/app/editor/graphics/palette_editor.cc
+++ b/src/app/editor/graphics/palette_editor.cc
@@ -2,9 +2,7 @@
 
 #include "absl/status/status.h"
 #include "app/gfx/snes_palette.h"
-#include "app/gui/canvas.h"
 #include "app/gui/color.h"
-#include "app/gui/icons.h"
 #include "app/gui/style.h"
 #include "imgui/imgui.h"
 
diff --git a/src/app/editor/overworld/entity.cc b/src/app/editor/overworld/entity.cc
index 90c2d79b..3459dc33 100644
--- a/src/app/editor/overworld/entity.cc
+++ b/src/app/editor/overworld/entity.cc
@@ -8,7 +8,6 @@ namespace app {
 namespace editor {
 
 using ImGui::BeginChild;
-using ImGui::BeginGroup;
 using ImGui::Button;
 using ImGui::Checkbox;
 using ImGui::EndChild;
diff --git a/src/app/editor/overworld/overworld_editor.cc b/src/app/editor/overworld/overworld_editor.cc
index 7ef21b18..96db7d69 100644
--- a/src/app/editor/overworld/overworld_editor.cc
+++ b/src/app/editor/overworld/overworld_editor.cc
@@ -109,7 +109,7 @@ void OverworldEditor::DrawToolset() {
       status_ = Redo();
     }
 
-    TEXT_COLUMN(ICON_MD_MORE_VERT)  // Separator
+    TEXT_COLUMN(ICON_MD_MORE_VERT) // Separator
 
     NEXT_COLUMN()
     if (Button(ICON_MD_ZOOM_OUT)) {
@@ -127,7 +127,7 @@ void OverworldEditor::DrawToolset() {
     }
     HOVER_HINT("Fullscreen Canvas")
 
-    TEXT_COLUMN(ICON_MD_MORE_VERT)  // Separator
+    TEXT_COLUMN(ICON_MD_MORE_VERT) // Separator
 
     NEXT_COLUMN()
     if (Selectable(ICON_MD_PAN_TOOL_ALT, current_mode == EditingMode::PAN)) {
@@ -186,7 +186,7 @@ void OverworldEditor::DrawToolset() {
     }
     HOVER_HINT("Gfx Group Editor")
 
-    TEXT_COLUMN(ICON_MD_MORE_VERT)  // Separator
+    TEXT_COLUMN(ICON_MD_MORE_VERT) // Separator
 
     TableNextColumn();
     if (Button(ICON_MD_CONTENT_COPY)) {
@@ -201,10 +201,10 @@ void OverworldEditor::DrawToolset() {
     }
     HOVER_HINT("Copy Map to Clipboard");
 
-    TableNextColumn();  // Palette
-    DisplayPalette(palette_, overworld_.is_loaded());
+    TableNextColumn(); // Palette
+    status_ = DisplayPalette(palette_, overworld_.is_loaded());
 
-    TEXT_COLUMN(ICON_MD_MORE_VERT)  // Separator
+    TEXT_COLUMN(ICON_MD_MORE_VERT) // Separator
 
     TableNextColumn();
     Checkbox("Properties", &show_properties);
@@ -514,10 +514,12 @@ void OverworldEditor::CheckForOverworldEdits() {
       int end_x = std::floor(end.x / kTile16Size) * kTile16Size;
       int end_y = std::floor(end.y / kTile16Size) * kTile16Size;
 
-      if (start_x > end_x) std::swap(start_x, end_x);
-      if (start_y > end_y) std::swap(start_y, end_y);
+      if (start_x > end_x)
+        std::swap(start_x, end_x);
+      if (start_y > end_y)
+        std::swap(start_y, end_y);
 
-      constexpr int local_map_size = 512;  // Size of each local map
+      constexpr int local_map_size = 512; // Size of each local map
       // Number of tiles per local map (since each tile is 16x16)
       constexpr int tiles_per_local_map = local_map_size / kTile16Size;
 
@@ -668,7 +670,8 @@ void OverworldEditor::DrawOverworldCanvas() {
     if (current_mode == EditingMode::DRAW_TILE) {
       CheckForOverworldEdits();
     }
-    if (IsItemHovered()) status_ = CheckForCurrentMap();
+    if (IsItemHovered())
+      status_ = CheckForCurrentMap();
   }
 
   ow_map_canvas_.DrawGrid();
@@ -1146,7 +1149,8 @@ void OverworldEditor::RefreshOverworldMap() {
     // We need to update the map and its siblings if it's a large map
     for (int i = 1; i < 4; i++) {
       int sibling_index = overworld_.overworld_map(source_map_id)->parent() + i;
-      if (i >= 2) sibling_index += 6;
+      if (i >= 2)
+        sibling_index += 6;
       futures.push_back(
           std::async(std::launch::async, refresh_map_async, sibling_index));
       indices[i] = sibling_index;
@@ -1175,7 +1179,8 @@ absl::Status OverworldEditor::RefreshMapPalette() {
     // We need to update the map and its siblings if it's a large map
     for (int i = 1; i < 4; i++) {
       int sibling_index = overworld_.overworld_map(current_map_)->parent() + i;
-      if (i >= 2) sibling_index += 6;
+      if (i >= 2)
+        sibling_index += 6;
       RETURN_IF_ERROR(
           overworld_.mutable_overworld_map(sibling_index)->LoadPalette());
       RETURN_IF_ERROR(
@@ -1418,7 +1423,7 @@ void OverworldEditor::DrawUsageGrid() {
   int totalSquares = 128;
   int squaresWide = 8;
   int squaresTall = (totalSquares + squaresWide - 1) /
-                    squaresWide;  // Ceiling of totalSquares/squaresWide
+                    squaresWide; // Ceiling of totalSquares/squaresWide
 
   // Loop through each row
   for (int row = 0; row < squaresTall; ++row) {
@@ -1433,9 +1438,8 @@ void OverworldEditor::DrawUsageGrid() {
 
       // Set highlight color if needed
       if (highlight) {
-        PushStyleColor(
-            ImGuiCol_Button,
-            ImVec4(1.0f, 0.5f, 0.0f, 1.0f));  // Or any highlight color
+        PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 0.5f, 0.0f,
+                                               1.0f)); // Or any highlight color
       }
 
       // Create a button or selectable for each square
@@ -1520,6 +1524,6 @@ void OverworldEditor::InitializeZeml() {
   });
 }
 
-}  // namespace editor
-}  // namespace app
-}  // namespace yaze
+} // namespace editor
+} // namespace app
+} // namespace yaze
diff --git a/src/app/editor/overworld/overworld_editor.h b/src/app/editor/overworld/overworld_editor.h
index 5d6cc9ab..2521a34e 100644
--- a/src/app/editor/overworld/overworld_editor.h
+++ b/src/app/editor/overworld/overworld_editor.h
@@ -66,13 +66,17 @@ constexpr absl::string_view kTileSelectorTab = "##TileSelectorTabBar";
 constexpr absl::string_view kOWEditTable = "##OWEditTable";
 constexpr absl::string_view kOWMapTable = "#MapSettingsTable";
 
+constexpr int kEntranceTileTypePtrLow = 0xDB8BF;
+constexpr int kEntranceTileTypePtrHigh = 0xDB917;
+constexpr int kNumEntranceTileTypes = 0x2C;
+
 class EntranceContext {
  public:
   absl::Status LoadEntranceTileTypes(Rom& rom) {
-    int offset_low = 0xDB8BF;
-    int offset_high = 0xDB917;
+    int offset_low = kEntranceTileTypePtrLow;
+    int offset_high = kEntranceTileTypePtrHigh;
 
-    for (int i = 0; i < 0x2C; i++) {
+    for (int i = 0; i < kNumEntranceTileTypes; i++) {
       // Load entrance tile types
       ASSIGN_OR_RETURN(auto value_low, rom.ReadWord(offset_low + i));
       entrance_tile_types_low_.push_back(value_low);
@@ -157,6 +161,10 @@ class OverworldEditor : public Editor,
    * @brief Draws the overworld map settings. Graphics, palettes, etc.
    */
   void DrawOverworldMapSettings();
+
+  /**
+   * @brief Draw the overworld settings for ZSCustomOverworld.
+   */
   void DrawCustomOverworldMapSettings();
 
   void RefreshChildMap(int i);
diff --git a/src/app/editor/system/command_manager.h b/src/app/editor/system/command_manager.h
index 931fb233..65d946d0 100644
--- a/src/app/editor/system/command_manager.h
+++ b/src/app/editor/system/command_manager.h
@@ -13,6 +13,7 @@ class Command {
  public:
   virtual ~Command() = default;
   virtual void Execute() = 0;
+  virtual std::string GetDescription() const = 0;
 };
 
 class CommandManager {