diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc
index fdfb9383..dacc3985 100644
--- a/src/app/editor/master_editor.cc
+++ b/src/app/editor/master_editor.cc
@@ -72,13 +72,35 @@ void MasterEditor::UpdateScreen() {
   DrawInfoPopup();
 
   TAB_BAR("##TabBar")
-  DrawOverworldEditor();
-  DrawDungeonEditor();
-  DrawGraphicsEditor();
-  DrawMusicEditor();
-  DrawSpriteEditor();
-  DrawScreenEditor();
-  DrawPaletteEditor();
+
+  TAB_ITEM("Overworld")
+  status_ = overworld_editor_.Update();
+  END_TAB_ITEM()
+
+  TAB_ITEM("Dungeon")
+  dungeon_editor_.Update();
+  END_TAB_ITEM()
+
+  TAB_ITEM("Graphics")
+  status_ = graphics_editor_.Update();
+  END_TAB_ITEM()
+
+  TAB_ITEM("Music")
+  music_editor_.Update();
+  END_TAB_ITEM()
+
+  TAB_ITEM("Sprites")
+  status_ = sprite_editor_.Update();
+  END_TAB_ITEM()
+
+  TAB_ITEM("Screens")
+  screen_editor_.Update();
+  END_TAB_ITEM()
+
+  TAB_ITEM("Palettes")
+  status_ = palette_editor_.Update();
+  END_TAB_ITEM()
+
   END_TAB_BAR()
 
   ImGui::End();
@@ -324,48 +346,6 @@ void MasterEditor::DrawHelpMenu() {
   }
 }
 
-void MasterEditor::DrawOverworldEditor() {
-  TAB_ITEM("Overworld")
-  status_ = overworld_editor_.Update();
-  END_TAB_ITEM()
-}
-
-void MasterEditor::DrawDungeonEditor() {
-  TAB_ITEM("Dungeon")
-  dungeon_editor_.Update();
-  END_TAB_ITEM()
-}
-
-void MasterEditor::DrawGraphicsEditor() {
-  TAB_ITEM("Graphics")
-  status_ = graphics_editor_.Update();
-  END_TAB_ITEM()
-}
-
-void MasterEditor::DrawPaletteEditor() {
-  TAB_ITEM("Palettes")
-  status_ = palette_editor_.Update();
-  END_TAB_ITEM()
-}
-
-void MasterEditor::DrawScreenEditor() {
-  TAB_ITEM("Screens")
-  screen_editor_.Update();
-  END_TAB_ITEM()
-}
-
-void MasterEditor::DrawMusicEditor() {
-  TAB_ITEM("Music")
-  music_editor_.Update();
-  END_TAB_ITEM()
-}
-
-void MasterEditor::DrawSpriteEditor() {
-  TAB_ITEM("Sprites")
-  status_ = sprite_editor_.Update();
-  END_TAB_ITEM()
-}
-
 }  // namespace editor
 }  // namespace app
 }  // namespace yaze
\ No newline at end of file
diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h
index 05fc5964..9dbb48f1 100644
--- a/src/app/editor/master_editor.h
+++ b/src/app/editor/master_editor.h
@@ -49,15 +49,7 @@ class MasterEditor : public SharedROM {
   void DrawEditMenu();
   void DrawViewMenu();
   void DrawHelpMenu();
-
-  void DrawOverworldEditor();
-  void DrawDungeonEditor();
-  void DrawGraphicsEditor();
-  void DrawPaletteEditor();
-  void DrawMusicEditor();
-  void DrawScreenEditor();
-  void DrawSpriteEditor();
-
+  
   bool about_ = false;
   bool rom_info_ = false;
   bool backup_rom_ = true;