diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/map/MapPane.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/map/MapPane.kt
index 306b6723..775661ba 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/map/MapPane.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/map/MapPane.kt
@@ -30,6 +30,9 @@ class MapPane(
       widthProperty().bind(mapVM.widthProperty)
       heightProperty().bind(mapVM.heightProperty)
 
+      mapVM.item.rowsProperty.addListener { _, _, _ -> render() }
+      mapVM.item.columnsProperty.addListener { _, _, _ -> render() }
+
       editorStateVM.showGridProperty.addListener { _, _, _ -> render() }
       editorStateVM.selectedLayerProperty.addListener { _, _, _ -> render() }
       editorStateVM.coverUnderlyingLayersProperty.addListener { _, _, _ -> render() }
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt
index 5bc0d78d..973447db 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt
@@ -16,7 +16,9 @@ class MainView : View("BASE Game Editor") {
 
       center = tabpane {
          tabs.bind(mainController.openMaps) { scope, map ->
-            Tab(map.name, find<MapFragment>(scope).root).apply {
+            Tab().apply {
+               textProperty().bindBidirectional(map.nameProperty)
+               content = find<MapFragment>(scope).root
                setOnClosed { mainController.openMaps.remove(scope) }
             }
          }
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt
index 15a86378..8d54cd3d 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt
@@ -128,5 +128,11 @@ class MapToolbarView : View() {
       }
 
       this += FontIcon("fa-paint-brush").apply { iconSize = 15 }
+
+      button(graphic = FontIcon("fa-sliders")) {
+         action {
+            find<MapSettingsFragment>().openModal(block = true, resizable = false)
+         }
+      }
    }
 }
\ No newline at end of file