diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/CXX.includecache b/cmake-build-debug/CMakeFiles/noggit.dir/CXX.includecache
index f3291256..37b733b7 100644
--- a/cmake-build-debug/CMakeFiles/noggit.dir/CXX.includecache
+++ b/cmake-build-debug/CMakeFiles/noggit.dir/CXX.includecache
@@ -1438,28 +1438,6 @@ string
 vector
 -
 
-/Volumes/APFS/NoggitQT/src/noggit/Misc.cpp
-noggit/Misc.h
--
-noggit/Selection.h
--
-noggit/ModelInstance.h
--
-noggit/WMOInstance.h
--
-iomanip
--
-map
--
-sstream
--
-string
--
-vector
--
-boost/optional.hpp
--
-
 /Volumes/APFS/NoggitQT/src/noggit/Model.cpp
 math/bounding_box.hpp
 -
@@ -1490,52 +1468,6 @@ sstream
 string
 -
 
-/Volumes/APFS/NoggitQT/src/noggit/ModelInstance.cpp
-math/bounding_box.hpp
--
-math/frustum.hpp
--
-noggit/Log.h
--
-noggit/Misc.h
--
-noggit/Model.h
--
-noggit/ModelInstance.h
--
-noggit/WMOInstance.h
--
-opengl/primitives.hpp
--
-opengl/scoped.hpp
--
-opengl/shader.hpp
--
-
-/Volumes/APFS/NoggitQT/src/noggit/ModelManager.cpp
-noggit/AsyncLoader.h
--
-noggit/Log.h
--
-noggit/Model.h
--
-noggit/ModelManager.h
--
-algorithm
--
-
-/Volumes/APFS/NoggitQT/src/noggit/Particle.cpp
-noggit/Misc.h
--
-noggit/Particle.h
--
-opengl/context.hpp
--
-opengl/shader.hpp
--
-list
--
-
 /Volumes/APFS/NoggitQT/src/noggit/Sky.cpp
 noggit/DBC.h
 -
@@ -1604,26 +1536,6 @@ string
 vector
 -
 
-/Volumes/APFS/NoggitQT/src/noggit/WMOInstance.cpp
-math/bounding_box.hpp
--
-noggit/Log.h
--
-noggit/MapHeaders.h
--
-noggit/Misc.h
--
-noggit/ModelInstance.h
--
-noggit/WMO.h
--
-noggit/WMOInstance.h
--
-opengl/primitives.hpp
--
-opengl/scoped.hpp
--
-
 /Volumes/APFS/NoggitQT/src/noggit/World.cpp
 noggit/World.h
 -
@@ -1892,6 +1804,20 @@ iostream
 boost/utility/in_place_factory.hpp
 -
 
+/Volumes/APFS/NoggitQT/src/noggit/ui/About.cpp
+noggit/ui/About.h
+-
+noggit/TextureManager.h
+-
+revision.h
+/Volumes/APFS/NoggitQT/src/noggit/ui/revision.h
+QIcon
+-
+QtWidgets/QLabel
+-
+QtWidgets/QVBoxLayout
+-
+
 /Volumes/APFS/NoggitQT/src/noggit/ui/FlattenTool.cpp
 noggit/ui/FlattenTool.hpp
 -
@@ -1908,28 +1834,6 @@ QtWidgets/QLabel
 QtWidgets/QRadioButton
 -
 
-/Volumes/APFS/NoggitQT/src/noggit/ui/ModelImport.cpp
-noggit/ui/ModelImport.h
--
-noggit/MapView.h
--
-noggit/ModelInstance.h
--
-noggit/Selection.h
--
-noggit/WMOInstance.h
--
-noggit/ui/ObjectEditor.h
--
-fstream
--
-regex
--
-string
--
-QtWidgets/QFormLayout
--
-
 /Volumes/APFS/NoggitQT/src/noggit/ui/ObjectEditor.cpp
 noggit/MapView.h
 -
@@ -4450,6 +4354,10 @@ QtCore/qobject.h
 qbrush.h
 /usr/local/Cellar/qt/5.15.0/lib/QtGui.framework/Headers/qbrush.h
 
+/usr/local/Cellar/qt/5.15.0/lib/QtGui.framework/Headers/QIcon
+qicon.h
+/usr/local/Cellar/qt/5.15.0/lib/QtGui.framework/Headers/qicon.h
+
 /usr/local/Cellar/qt/5.15.0/lib/QtGui.framework/Headers/QPaintEvent
 qevent.h
 /usr/local/Cellar/qt/5.15.0/lib/QtGui.framework/Headers/qevent.h
@@ -4512,6 +4420,16 @@ QtGui/qvector2d.h
 QtGui/qtouchdevice.h
 -
 
+/usr/local/Cellar/qt/5.15.0/lib/QtGui.framework/Headers/qicon.h
+QtGui/qtguiglobal.h
+-
+QtCore/qsize.h
+-
+QtCore/qlist.h
+-
+QtGui/qpixmap.h
+-
+
 /usr/local/Cellar/qt/5.15.0/lib/QtGui.framework/Headers/qpainter.h
 QtGui/qtguiglobal.h
 -
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ChunkWater.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ChunkWater.cpp.o
index 17cccca9..2c30a4e9 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ChunkWater.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ChunkWater.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapChunk.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapChunk.cpp.o
index f6200373..97fdd2c9 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapChunk.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapChunk.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapTile.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapTile.cpp.o
index 188c0f8f..27b3fba6 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapTile.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapTile.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapView.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapView.cpp.o
index 86cfe037..021601a1 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapView.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/MapView.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/TileWater.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/TileWater.cpp.o
index 30c65275..1de67b30 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/TileWater.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/TileWater.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/World.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/World.cpp.o
index a7f53b5e..5df55ab4 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/World.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/World.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/application.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/application.cpp.o
index f3392f85..de3229fb 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/application.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/application.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/liquid_layer.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/liquid_layer.cpp.o
index eff9e695..45ed7343 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/liquid_layer.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/liquid_layer.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/map_horizon.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/map_horizon.cpp.o
index 30c484f3..e32b2ef5 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/map_horizon.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/map_horizon.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/map_index.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/map_index.cpp.o
index 4af35311..f98e5010 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/map_index.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/map_index.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/texture_set.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/texture_set.cpp.o
index fa7e87b5..7fb26777 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/texture_set.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/texture_set.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/About.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/About.cpp.o
index 2a81563f..cff5fabc 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/About.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/About.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/FlattenTool.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/FlattenTool.cpp.o
index 8e52b1b3..817c1030 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/FlattenTool.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/FlattenTool.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/ObjectEditor.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/ObjectEditor.cpp.o
index b627c6fe..fbfa379a 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/ObjectEditor.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/ObjectEditor.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/RotationEditor.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/RotationEditor.cpp.o
index 0b48efa9..cd741377 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/RotationEditor.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/RotationEditor.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/TexturePicker.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/TexturePicker.cpp.o
index 056fd7d6..53140b41 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/TexturePicker.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/TexturePicker.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/Water.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/Water.cpp.o
index 5a17c3b0..a3e28049 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/Water.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/Water.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/main_window.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/main_window.cpp.o
index 3bf6d764..e0bbef9e 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/main_window.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/main_window.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/minimap_widget.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/minimap_widget.cpp.o
index 87766b98..aec60775 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/minimap_widget.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/minimap_widget.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/moc_TexturePicker.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/moc_TexturePicker.cpp.o
index 0e9aec71..b144d286 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/moc_TexturePicker.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/moc_TexturePicker.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/moc_main_window.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/moc_main_window.cpp.o
index 4d145f96..71cf6f7b 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/moc_main_window.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/moc_main_window.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/shader_tool.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/shader_tool.cpp.o
index 145e3891..0d1158dc 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/shader_tool.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/shader_tool.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/terrain_tool.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/terrain_tool.cpp.o
index d9ca3ad1..f5bc1404 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/terrain_tool.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/terrain_tool.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/texture_swapper.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/texture_swapper.cpp.o
index 8b75ce29..9df94959 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/texture_swapper.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/texture_swapper.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/texturing_tool.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/texturing_tool.cpp.o
index c00e4b7a..ee5a540e 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/texturing_tool.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/ui/texturing_tool.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/world_model_instances_storage.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/world_model_instances_storage.cpp.o
index 3b586200..470c4a0d 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/world_model_instances_storage.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/world_model_instances_storage.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/world_tile_update_queue.cpp.o b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/world_tile_update_queue.cpp.o
index f50e3215..c403dca8 100644
Binary files a/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/world_tile_update_queue.cpp.o and b/cmake-build-debug/CMakeFiles/noggit.dir/src/noggit/world_tile_update_queue.cpp.o differ
diff --git a/cmake-build-debug/bin/noggit.app/Contents/MacOS/noggit b/cmake-build-debug/bin/noggit.app/Contents/MacOS/noggit
index bc63f31a..2101d79b 100755
Binary files a/cmake-build-debug/bin/noggit.app/Contents/MacOS/noggit and b/cmake-build-debug/bin/noggit.app/Contents/MacOS/noggit differ
diff --git a/cmake-build-debug/revision.state b/cmake-build-debug/revision.state
index 4869764e..8da55680 100644
--- a/cmake-build-debug/revision.state
+++ b/cmake-build-debug/revision.state
@@ -1 +1 @@
-9cc1f248d245595dc0553c7d587584e78e017f9df8c2d94d5790305d8dfad898
\ No newline at end of file
+92a5ca42b78160675c3416345d4fdfe853a7c150bff12600598a413cd07e792f
\ No newline at end of file
diff --git a/cmake-build-debug/revision_output/revision.h b/cmake-build-debug/revision_output/revision.h
index f824ffc4..8e6c7076 100644
--- a/cmake-build-debug/revision_output/revision.h
+++ b/cmake-build-debug/revision_output/revision.h
@@ -2,4 +2,4 @@
 
 #pragma once
 
-#define STRPRODUCTVER "3.d4ca960+"
+#define STRPRODUCTVER "3.1589217+"
diff --git a/src/noggit/MapTile.cpp b/src/noggit/MapTile.cpp
index 96813f8b..a229ae10 100644
--- a/src/noggit/MapTile.cpp
+++ b/src/noggit/MapTile.cpp
@@ -434,20 +434,30 @@ void MapTile::drawMFBO (opengl::scoped::use_program& mfbo_shader)
       mfbo_shader.attrib("position", 3, GL_FLOAT, GL_FALSE, 0, 0);
     }
 
+    {
+      opengl::scoped::buffer_binder<GL_ELEMENT_ARRAY_BUFFER> ibo_binder(_mfbo_indices);
+      gl.bufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(uint16_t), indices.data(), GL_STATIC_DRAW);
+    }
+
     _mfbo_buffer_are_setup = true;
   }
 
   {
     opengl::scoped::vao_binder const _(_mfbo_bottom_vao);
+    opengl::scoped::buffer_binder<GL_ELEMENT_ARRAY_BUFFER> ibo_binder(_mfbo_indices);
+
     mfbo_shader.uniform("color", math::vector_4d(1.0f, 1.0f, 0.0f, 0.2f));
-    gl.drawElements(GL_TRIANGLE_FAN, indices.size(), GL_UNSIGNED_BYTE, indices.data());
+    gl.drawElements(GL_TRIANGLE_FAN, indices.size(), GL_UNSIGNED_BYTE, nullptr);
   }
 
   {
     opengl::scoped::vao_binder const _(_mfbo_top_vao);
+    opengl::scoped::buffer_binder<GL_ELEMENT_ARRAY_BUFFER> ibo_binder(_mfbo_indices);
+
     mfbo_shader.uniform("color", math::vector_4d(0.0f, 1.0f, 1.0f, 0.2f));
-    gl.drawElements(GL_TRIANGLE_FAN, indices.size(), GL_UNSIGNED_BYTE, indices.data());
+    gl.drawElements(GL_TRIANGLE_FAN, indices.size(), GL_UNSIGNED_BYTE, nullptr);
   }
+
 }
 
 void MapTile::drawWater ( math::frustum const& frustum
diff --git a/src/noggit/MapTile.h b/src/noggit/MapTile.h
index 2622914a..25e6ee46 100644
--- a/src/noggit/MapTile.h
+++ b/src/noggit/MapTile.h
@@ -135,9 +135,10 @@ private:
   opengl::scoped::deferred_upload_vertex_arrays<2> _mfbo_vaos;
   GLuint const& _mfbo_bottom_vao = _mfbo_vaos[0];
   GLuint const& _mfbo_top_vao = _mfbo_vaos[1];
-  opengl::scoped::deferred_upload_buffers<2> _mfbo_vbos;
+  opengl::scoped::deferred_upload_buffers<3> _mfbo_vbos;
   GLuint const& _mfbo_bottom_vbo = _mfbo_vbos[0];
   GLuint const& _mfbo_top_vbo = _mfbo_vbos[1];
+  GLuint const& _mfbo_indices = _mfbo_vbos[2];
 
   // MHDR:
   int mFlags;