diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2e28be3..8b2afef 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,11 +1,12 @@
 [versions]
 jdk = "21"
+javafx = "23"
 ikonliJavafx = "12.3.1"
 slf4j = "2.0.16"
 ikonli = "12.3.1"
 junit = "5.11.4"
 testcontainers = "1.20.4"
-mockito = "5.14.2"
+mockito = "5.15.2"
 gestalt = "0.35.1"
 eclipseCollections = "12.0.0.M3"
 jackson = "2.18.2"
@@ -17,10 +18,10 @@ fury = "0.9.0"
 avajeValidaor = "2.4"
 h2 = "2.3.232"
 asciidoctor = "4.0.4"
-avajeInject = "11.1-RC1"
+avajeInject = "11.1"
 record-builder = "44"
 mutinyVertx = "3.17.1"
-schemacrawler = "16.24.2"
+schemacrawler = "16.25.1"
 polyglot = "24.1.1"
 ebean = "15.8.1"
 immutables = "2.10.1"
@@ -34,11 +35,10 @@ maniftest = { id = "com.coditory.manifest", version = "1.1.0" }
 shadow = { id = "com.gradleup.shadow", version = "9.0.0-beta4" }
 jlink = { id = "org.beryx.jlink", version = "3.1.1" }
 graalvm = { id = "org.graalvm.buildtools.native", version = "0.10.4" }
-spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA4" }
+spotless = { id = "com.diffplug.spotless", version = "7.0.1" }
 sass = { id = "io.miret.etienne.sass", version = "1.5.1" }
 ebean = { id = "io.ebean", version.ref = "ebean" }
 semver = { id = "com.xenoterracide.gradle.semver", version = "0.11.5" }
-frontend = { id = "org.siouan.frontend-jdk21", version = "10.0.0" }
 docker = { id = "com.bmuschko.docker-java-application", version = "9.4.0" }
 javamodularity = { id = "org.javamodularity.moduleplugin", version = "1.8.15" }
 asciidoctorJvm = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor" }
@@ -63,7 +63,7 @@ slf4jJdkPlatform = { group = "org.slf4j", name = "slf4j-jdk-platform-logging", v
 slf4jJulBridage = { group = "org.slf4j", name = "jul-to-slf4j", version.ref = "slf4j" }
 
 oshi = { group = "com.github.oshi", name = "oshi-core-java11", version = "6.6.5" }
-logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.15" }
+logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.16" }
 
 #UI
 simpleicon = { group = "org.kordamp.ikonli", name = "ikonli-simpleicons-pack", version.ref = "ikonli" }
@@ -81,7 +81,7 @@ junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
 junit-juiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" }
 junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" }
 junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
-junit-platform-suite = { group = "org.junit.platform", name = "junit-platform-suite", version = "1.11.3" }
+junit-platform-suite = { group = "org.junit.platform", name = "junit-platform-suite", version = "1.11.4" }
 junit-perf = { group = "com.github.noconnor", name = "junitperf-junit5", version = "1.37.0" }
 testcontainers-bom = { group = "org.testcontainers", name = "testcontainers-bom", version.ref = "testcontainers" }
 testcontainers = { group = "org.testcontainers", name = "testcontainers", version.ref = "testcontainers" }
@@ -101,7 +101,7 @@ guava = { group = "com.google.guava", name = "guava", version = "33.4.0-jre" }
 mysql = { group = "com.mysql", name = "mysql-connector-j", version = "9.1.0" }
 postgres = { group = "org.postgresql", name = "postgresql", version = "42.7.4" }
 h2 = { group = "com.h2database", name = "h2", version.ref = "h2" }
-sqlite = { group = "org.xerial", name = "sqlite-jdbc", version = "3.47.1.0" }
+sqlite = { group = "org.xerial", name = "sqlite-jdbc", version = "3.47.2.0" }
 
 eclipse-collections-api = { group = "org.eclipse.collections", name = "eclipse-collections-api", version.ref = "eclipseCollections" }
 eclipse-collections = { group = "org.eclipse.collections", name = "eclipse-collections", version.ref = "eclipseCollections" }
@@ -148,7 +148,7 @@ jgit-lfs = { group = "org.eclipse.jgit", name = "org.eclipse.jgit.lfs", version.
 jgit-ssh = { group = "org.eclipse.jgit", name = "org.eclipse.jgit.ssh.apache", version.ref = "jgit" }
 jgit-http = { group = "org.eclipse.jgit", name = "org.eclipse.jgit.http.apache", version.ref = "jgit" }
 
-jsh = { group = "com.github.mwiede", name = "jsch", version = "0.2.21" }
+jsh = { group = "com.github.mwiede", name = "jsch", version = "0.2.22" }
 
 vertx-core = { group = "io.vertx", name = "vertx-core", version.ref = "vertx" }
 vertx-junit5 = { group = "io.vertx", name = "vertx-junit5", version.ref = "vertx" }
@@ -211,4 +211,5 @@ theme-detector = { group = "com.github.Dansoftowner", name = "jSystemThemeDetect
 lombok-plugin = { group = "name.remal.gradle-plugins.lombok", name = "lombok", version = "2.2.14" }
 
 bootstrap = { group = "org.webjars", name = "bootstrap", version = "5.3.3" }
-tailwindcss = { group = "org.webjars.npm", name = "tailwindcss", version = "4.0.0-beta.3" }
\ No newline at end of file
+tailwindcss = { group = "org.webjars.npm", name = "tailwindcss", version = "4.0.0-beta.3" }
+auto-factory = {group="com.google.auto.factory",name="auto-factory",version="1.1.0"}
\ No newline at end of file
diff --git a/visual-app/build.gradle.kts b/visual-app/build.gradle.kts
index f15659c..2c5da3e 100644
--- a/visual-app/build.gradle.kts
+++ b/visual-app/build.gradle.kts
@@ -120,7 +120,7 @@ dependencies {
 
 javafx {
   modules(*javafxModules.toTypedArray())
-  version = "23"
+  version = libs.versions.javafx.get()
   configurations =
     arrayOf(
       IMPLEMENTATION,
diff --git a/visual-app/src/main/java/module-info.java b/visual-app/src/main/java/module-info.java
index e83dadf..fa00340 100644
--- a/visual-app/src/main/java/module-info.java
+++ b/visual-app/src/main/java/module-info.java
@@ -41,7 +41,7 @@
   requires io.avaje.validation;
   requires com.github.benmanes.caffeine;
   requires jdk.management;
-
+  requires org.visual.editor;
   requires io.smallrye.mutiny.vertx.core;
 
   requires com.jthemedetector;
diff --git a/visual-app/src/main/java/org/visual/app/component/EditorContainer.java b/visual-app/src/main/java/org/visual/app/component/EditorContainer.java
deleted file mode 100644
index 7bcadfc..0000000
--- a/visual-app/src/main/java/org/visual/app/component/EditorContainer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.visual.app.component;
-
-import javafx.scene.layout.AnchorPane;
-import lombok.extern.slf4j.Slf4j;
-import lombok.val;
-
-@Slf4j
-public class EditorContainer extends AnchorPane {
-
-  private final GridBackground gridBackground = new GridBackground();
-
-  public EditorContainer() {
-    getChildren().add(gridBackground);
-  }
-
-  @Override
-  protected void layoutChildren() {
-    super.layoutChildren();
-    val width = getWidth();
-    val height = getHeight();
-    gridBackground.resizeRelocate(0, 0, width, height);
-  }
-}
diff --git a/visual-app/src/main/java/org/visual/app/context/DiagramContext.java b/visual-app/src/main/java/org/visual/app/context/DiagramContext.java
index 5c26df2..217be5d 100644
--- a/visual-app/src/main/java/org/visual/app/context/DiagramContext.java
+++ b/visual-app/src/main/java/org/visual/app/context/DiagramContext.java
@@ -4,7 +4,7 @@
 import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.visual.data.structure.diagram.VisualDiagram;
+import org.visual.data.structure.diagram.VDiagram;
 
 import java.util.List;
 
@@ -13,9 +13,9 @@
 @RequiredArgsConstructor
 public class DiagramContext {
 
-  private final List<VisualDiagram> diagrams = new ObjectArrayList<>();
+  private final List<VDiagram> diagrams = new ObjectArrayList<>();
 
-  public void add(VisualDiagram diagram) {
+  public void add(VDiagram diagram) {
     diagrams.add(diagram);
   }
 }
diff --git a/visual-app/src/main/java/org/visual/app/controller/dialog/GettingStartedController.java b/visual-app/src/main/java/org/visual/app/controller/dialog/GettingStartedController.java
index 3c7b6ae..96d71b3 100644
--- a/visual-app/src/main/java/org/visual/app/controller/dialog/GettingStartedController.java
+++ b/visual-app/src/main/java/org/visual/app/controller/dialog/GettingStartedController.java
@@ -17,7 +17,6 @@
 import lombok.val;
 import org.visual.app.component.NavigationPane;
 import org.visual.app.context.DiagramContext;
-import org.visual.app.util.CreateDiagram;
 
 import java.io.File;
 import java.net.URL;
@@ -71,15 +70,15 @@ public void handleCreateNewWorkspace(ActionEvent actionEvent) {
   }
 
   public void handleCreateNewDiagram() {
-    Uni.createFrom().item(CreateDiagram.createDefaultDiagram())
-      .log()
-      .invoke(diagramContext::add)
-      .subscribe().with(t -> {
-        Platform.runLater(() -> {
-          val stage = (Stage) root.getScene().getWindow();
-          stage.close();
-        });
-      });
+//    Uni.createFrom().item(CreateDiagram.createDefaultDiagram())
+//      .log()
+//      .invoke(diagramContext::add)
+//      .subscribe().with(t -> {
+//        Platform.runLater(() -> {
+//          val stage = (Stage) root.getScene().getWindow();
+//          stage.close();
+//        });
+//      });
   }
 
   public void handleExit() {
diff --git a/visual-app/src/main/java/org/visual/app/controller/workspace/EditorController.java b/visual-app/src/main/java/org/visual/app/controller/workspace/EditorController.java
index 59b7812..c641235 100644
--- a/visual-app/src/main/java/org/visual/app/controller/workspace/EditorController.java
+++ b/visual-app/src/main/java/org/visual/app/controller/workspace/EditorController.java
@@ -3,15 +3,10 @@
 import jakarta.inject.Singleton;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.Background;
-import javafx.scene.paint.Color;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
-import org.visual.app.component.DataContent;
-import org.visual.app.component.DraggableStackPane;
-import org.visual.app.component.EditorContainer;
-import org.visual.app.model.DatabaseObjBuilder;
+import org.visual.editor.core.VisualEditor;
+import org.visual.editor.view.EditorContainer;
+import org.visual.editor.view.model.EditorProperties;
 
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -22,22 +17,20 @@ public class EditorController implements Initializable {
 
   @FXML
   private EditorContainer container;
-  @FXML
-  private ScrollPane root;
+
+  private final EditorProperties properties = new EditorProperties();
+
+  private final VisualEditor visualEditor = new VisualEditor(properties);
 
   @Override
   public void initialize(URL url, ResourceBundle resourceBundle) {
-    val stackPane = new DraggableStackPane();
-    stackPane.setBackground(Background.fill(Color.ALICEBLUE));
-    val dc = new DataContent(DatabaseObjBuilder.builder()
-      .name("test")
-      .type("test")
-      .build());
-    container.setOnMouseDragged(event -> {
-      System.err.println(container.getWidth());
-      System.err.println(container.getHeight());
-    });
-    stackPane.getChildren().add(dc);
-    container.getChildren().add(stackPane);
+//    val model = VModel.builder()
+//      .version("1.0")
+//      .type("graph")
+//      .contentWidth(1000.0)
+//      .contentHeight(1000.0)
+//      .build();
+//    visualEditor.setModel(model);
+//    container.setVisualEditor(visualEditor);
   }
 }
diff --git a/visual-app/src/main/java/org/visual/app/lifecycle/SetupThemeLifecycle.java b/visual-app/src/main/java/org/visual/app/lifecycle/SetupThemeLifecycle.java
index 3f748c4..bfceeb2 100644
--- a/visual-app/src/main/java/org/visual/app/lifecycle/SetupThemeLifecycle.java
+++ b/visual-app/src/main/java/org/visual/app/lifecycle/SetupThemeLifecycle.java
@@ -20,6 +20,7 @@ public class SetupThemeLifecycle implements ViewLifecycle {
   @Override
   public void onInit() {
     setUserAgentStylesheet(detectTheme());
+    detector.registerListener(isDark -> setUserAgentStylesheet(isDark ? new PrimerDark().getUserAgentStylesheet() : new PrimerLight().getUserAgentStylesheet()));
   }
 
   private @NotNull String detectTheme() {
diff --git a/visual-app/src/main/java/org/visual/app/util/CreateDiagram.java b/visual-app/src/main/java/org/visual/app/util/CreateDiagram.java
index 5ba73b7..e036a70 100644
--- a/visual-app/src/main/java/org/visual/app/util/CreateDiagram.java
+++ b/visual-app/src/main/java/org/visual/app/util/CreateDiagram.java
@@ -1,34 +1,26 @@
 package org.visual.app.util;
 
 import lombok.experimental.UtilityClass;
-import lombok.val;
-import org.visual.data.structure.diagram.VisualDiagram;
-import org.visual.data.structure.diagram.VisualDiagramMetadata;
-import org.visual.data.structure.graph.VisualGraphicalObject;
-import org.visual.data.structure.graph.VisualProperties;
-
-import java.util.Date;
-import java.util.UUID;
 
 @UtilityClass
 public class CreateDiagram {
 
-  public VisualDiagram createDefaultDiagram() {
-    val meta = VisualDiagramMetadata.builder().createAt(new Date())
-      .lastModifiedAt(new Date())
-      .title("untitled")
-      .build();
-    val prop = VisualProperties
-      .builder()
-      .color("red")
-      .borderWidth(1)
-      .borderColor("non")
-      .width(20.0)
-      .height(20.0)
-      .build();
-    VisualGraphicalObject.builder().id(UUID.randomUUID().toString()).type("rec").x(20).y(20).properties(prop).build();
-    return VisualDiagram.builder().version("0.1")
-      .metadata(meta)
-      .build();
-  }
+//  public VisualDiagram createDefaultDiagram() {
+//    val meta = VisualDiagramMetadata.builder().createAt(new Date())
+//      .lastModifiedAt(new Date())
+//      .title("untitled")
+//      .build();
+//    val prop = VisualProperties
+//      .builder()
+//      .color("red")
+//      .borderWidth(1)
+//      .borderColor("non")
+//      .width(20.0)
+//      .height(20.0)
+//      .build();
+//    VisualGraphicalObject.builder().id(UUID.randomUUID().toString()).type("rec").x(20).y(20).properties(prop).build();
+//    return VisualDiagram.builder().version("0.1")
+//      .metadata(meta)
+//      .build();
+//  }
 }
diff --git a/visual-app/src/main/resources/org/visual/app/view/workspace/Editor.fxml b/visual-app/src/main/resources/org/visual/app/view/workspace/Editor.fxml
index f9cd9fb..00ec2b1 100644
--- a/visual-app/src/main/resources/org/visual/app/view/workspace/Editor.fxml
+++ b/visual-app/src/main/resources/org/visual/app/view/workspace/Editor.fxml
@@ -1,23 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.StackPane?>
-<?import org.visual.app.component.GridBackground?>
-<?import org.visual.app.component.EditorContainer?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.Group?>
+<?import org.visual.editor.view.EditorContainer?>
 <StackPane xmlns="http://javafx.com/javafx"
            xmlns:fx="http://javafx.com/fxml"
            fx:controller="org.visual.app.controller.workspace.EditorController"
            style="-fx-background-color: white;"
 >
-  <ScrollPane fx:id="root" fitToHeight="true" fitToWidth="true" vbarPolicy="ALWAYS" hbarPolicy="ALWAYS">
-    <Group>
-      <EditorContainer fx:id="container"/>
-    </Group>
-  </ScrollPane>
-  <Button text="floating" StackPane.alignment="TOP_RIGHT" fx:id="floatingButton"/>
-
+  <EditorContainer fx:id="container" minWidth="0" minHeight="0" maxWidth="+Infinity" maxHeight="+Infinity"/>
 </StackPane>
diff --git a/visual-app/src/main/resources/org/visual/app/view/workspace/Tab.fxml b/visual-app/src/main/resources/org/visual/app/view/workspace/Tab.fxml
index 55327c1..5d2e591 100644
--- a/visual-app/src/main/resources/org/visual/app/view/workspace/Tab.fxml
+++ b/visual-app/src/main/resources/org/visual/app/view/workspace/Tab.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.layout.HBox?>
-<?import org.visual.app.component.GridBackground?>
+<?import org.visual.editor.view.GridBackground?>
 <TabPane fx:id="root" xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.visual.app.controller.workspace.TabController"
diff --git a/visual-data-structure/build.gradle.kts b/visual-data-structure/build.gradle.kts
index 19b6928..e3ed612 100644
--- a/visual-data-structure/build.gradle.kts
+++ b/visual-data-structure/build.gradle.kts
@@ -9,4 +9,6 @@ dependencies {
   implementation(libs.jgrapht)
   compileOnly(libs.immutables.value)
   annotationProcessor(libs.immutables.value)
+  implementation(libs.eclipse.collections.api)
+  implementation(libs.eclipse.collections)
 }
\ No newline at end of file
diff --git a/visual-data-structure/src/main/java/module-info.java b/visual-data-structure/src/main/java/module-info.java
index 0244653..eec2ed3 100644
--- a/visual-data-structure/src/main/java/module-info.java
+++ b/visual-data-structure/src/main/java/module-info.java
@@ -2,6 +2,7 @@
   requires static lombok;
   requires static org.jetbrains.annotations;
   requires static org.immutables.value;
+  requires org.eclipse.collections.api;
 
   requires org.jgrapht.core;
   requires org.slf4j;
@@ -13,4 +14,5 @@
   exports org.visual.data.structure.constant;
   exports org.visual.data.structure.graph;
   exports org.visual.data.structure.diagram;
+  exports org.visual.data.structure.impl;
 }
\ No newline at end of file
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Classifiable.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Classifiable.java
new file mode 100644
index 0000000..ecda52b
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Classifiable.java
@@ -0,0 +1,5 @@
+package org.visual.data.structure.graph;
+
+public interface Classifiable {
+  String type();
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Connection.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Connection.java
new file mode 100644
index 0000000..a669d2f
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Connection.java
@@ -0,0 +1,16 @@
+package org.visual.data.structure.graph;
+
+import org.immutables.value.Value;
+import org.visual.data.structure.style.VisualDataStructureStyle;
+
+import java.util.List;
+
+@Value.Immutable
+@VisualDataStructureStyle
+public interface Connection extends Identifiable, Classifiable {
+  Connector source();
+
+  Connector target();
+
+  List<Joint> joints();
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Connector.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Connector.java
new file mode 100644
index 0000000..60f75f2
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Connector.java
@@ -0,0 +1,16 @@
+package org.visual.data.structure.graph;
+
+import java.util.List;
+
+public interface Connector extends GraphicalObject {
+
+  Node parent();
+
+  List<Connection> connections();
+
+  void addConnection(Connection connection);
+
+  void removeConnection(Connection connection);
+
+  Boolean isConnectionDetachedOnDrag();
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/GraphicalObject.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/GraphicalObject.java
index 97f2c43..25ab1ea 100644
--- a/visual-data-structure/src/main/java/org/visual/data/structure/graph/GraphicalObject.java
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/GraphicalObject.java
@@ -1,18 +1,21 @@
 package org.visual.data.structure.graph;
 
-import org.immutables.value.Value;
-import org.visual.data.structure.style.VisualDataStructureStyle;
+import lombok.NonNull;
 
-@Value.Immutable
-@VisualDataStructureStyle
-public interface GraphicalObject {
-  String id();
+public interface GraphicalObject extends Identifiable, Classifiable {
+  Double getX();
 
-  String type();
+  void setX(@NonNull Double x);
 
-  int x();
+  Double getY();
 
-  int y();
+  void setY(@NonNull Double y);
 
-  Properties properties();
+  Double getWidth();
+
+  void setWidth(@NonNull Double width);
+
+  Double getHeight();
+
+  void setHeight(@NonNull Double height);
 }
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Identifiable.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Identifiable.java
new file mode 100644
index 0000000..decf3cf
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Identifiable.java
@@ -0,0 +1,11 @@
+package org.visual.data.structure.graph;
+
+import org.immutables.value.Value;
+
+import java.util.UUID;
+
+public interface Identifiable {
+  default String id() {
+    return UUID.randomUUID().toString();
+  }
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Joint.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Joint.java
new file mode 100644
index 0000000..e3a67bc
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Joint.java
@@ -0,0 +1,6 @@
+package org.visual.data.structure.graph;
+
+public interface Joint extends GraphicalObject {
+
+  Connection connection();
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Model.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Model.java
new file mode 100644
index 0000000..ea6136a
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Model.java
@@ -0,0 +1,25 @@
+package org.visual.data.structure.graph;
+
+import java.util.List;
+
+public interface Model {
+  List<Node> nodes();
+
+  void addNode(Node node);
+
+  void removeNode(Node node);
+
+  List<Connection> connections();
+
+  void addConnection(Connection connection);
+
+  String type();
+
+  Double getContentWidth();
+
+  void setContentWidth(Double contentWidth);
+
+  Double getContentHeight();
+
+  void setContentHeight(Double contentHeight);
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Node.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Node.java
new file mode 100644
index 0000000..85afa62
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Node.java
@@ -0,0 +1,11 @@
+package org.visual.data.structure.graph;
+
+
+import java.util.List;
+
+public interface Node extends GraphicalObject {
+
+  List<Connector> connectors();
+
+  void addConnector(Connector connector);
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Properties.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Properties.java
index 2ebd028..421df8e 100644
--- a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Properties.java
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Properties.java
@@ -3,8 +3,6 @@
 import org.immutables.value.Value;
 import org.visual.data.structure.style.VisualDataStructureStyle;
 
-@Value.Immutable()
-@VisualDataStructureStyle
 public interface Properties {
   String color();
 
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Rectangle.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Rectangle.java
index f7a107a..2cf2515 100644
--- a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Rectangle.java
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Rectangle.java
@@ -1,12 +1,7 @@
 package org.visual.data.structure.graph;
 
-import org.immutables.value.Value;
-import org.visual.data.structure.style.VisualDataStructureStyle;
-
 import java.util.List;
 
-@Value.Immutable
-@VisualDataStructureStyle
 public interface Rectangle extends GraphicalObject {
   List<GraphicalObject> children();
 
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Workspace.java b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Workspace.java
index b6af548..e23a403 100644
--- a/visual-data-structure/src/main/java/org/visual/data/structure/graph/Workspace.java
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/graph/Workspace.java
@@ -1,10 +1,8 @@
 package org.visual.data.structure.graph;
 
-import org.immutables.value.Value;
 import org.jgrapht.Graph;
 import org.visual.data.structure.style.VisualDataStructureStyle;
 
-@Value.Immutable
 @VisualDataStructureStyle
 public interface Workspace {
   Graph<String, String> graph();
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/impl/AbstractGraphicalObject.java b/visual-data-structure/src/main/java/org/visual/data/structure/impl/AbstractGraphicalObject.java
new file mode 100644
index 0000000..1cbae92
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/impl/AbstractGraphicalObject.java
@@ -0,0 +1,14 @@
+package org.visual.data.structure.impl;
+
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+import org.visual.data.structure.graph.GraphicalObject;
+
+@Data
+@SuperBuilder
+public abstract class AbstractGraphicalObject implements GraphicalObject {
+  private Double x;
+  private Double y;
+  private Double width;
+  private Double height;
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/impl/VConnector.java b/visual-data-structure/src/main/java/org/visual/data/structure/impl/VConnector.java
new file mode 100644
index 0000000..fda2a73
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/impl/VConnector.java
@@ -0,0 +1,56 @@
+package org.visual.data.structure.impl;
+
+import lombok.Builder;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.list.MutableList;
+import org.visual.data.structure.graph.Connection;
+import org.visual.data.structure.graph.Connector;
+import org.visual.data.structure.graph.Node;
+
+import java.util.List;
+
+@Slf4j
+@Builder
+public class VConnector extends AbstractGraphicalObject implements Connector {
+
+  private Node node;
+
+  private final MutableList<Connection> connections = Lists.mutable.empty();
+
+  @Override
+  public Node parent() {
+    return node;
+  }
+
+  @Override
+  public List<Connection> connections() {
+    return connections.asUnmodifiable();
+  }
+
+  @Override
+  public void addConnection(Connection connection) {
+    if (connections.contains(connection)) {
+      return;
+    }
+    connections.add(connection);
+  }
+
+  @Override
+  public void removeConnection(Connection connection) {
+    if (!connections.contains(connection)) {
+      return;
+    }
+    connections.remove(connection);
+  }
+
+  @Override
+  public Boolean isConnectionDetachedOnDrag() {
+    return null;
+  }
+
+  @Override
+  public String type() {
+    return "";
+  }
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/impl/VModel.java b/visual-data-structure/src/main/java/org/visual/data/structure/impl/VModel.java
new file mode 100644
index 0000000..0f50546
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/impl/VModel.java
@@ -0,0 +1,56 @@
+package org.visual.data.structure.impl;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.list.MutableList;
+import org.visual.data.structure.graph.Connection;
+import org.visual.data.structure.graph.Model;
+import org.visual.data.structure.graph.Node;
+
+import java.util.List;
+
+@Data
+@Slf4j
+@Builder
+public class VModel implements Model {
+
+  private final MutableList<Node> nodes = Lists.mutable.empty();
+
+  private final MutableList<Connection> connections = Lists.mutable.empty();
+
+  private Double contentWidth;
+
+  private Double contentHeight;
+
+  @Override
+  public List<Node> nodes() {
+    return nodes.asUnmodifiable();
+  }
+
+  @Override
+  public void addNode(Node node) {
+    nodes.add(node);
+  }
+
+  @Override
+  public void removeNode(Node node) {
+    nodes.remove(node);
+  }
+
+  @Override
+  public List<Connection> connections() {
+    return connections.asUnmodifiable();
+  }
+
+  @Override
+  public void addConnection(Connection connection) {
+    connections.add(connection);
+  }
+
+  @Override
+  public String type() {
+    return "";
+  }
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/impl/VNode.java b/visual-data-structure/src/main/java/org/visual/data/structure/impl/VNode.java
new file mode 100644
index 0000000..b3474c9
--- /dev/null
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/impl/VNode.java
@@ -0,0 +1,38 @@
+package org.visual.data.structure.impl;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.list.MutableList;
+import org.visual.data.structure.graph.Connector;
+import org.visual.data.structure.graph.Node;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Slf4j
+@Data
+@SuperBuilder
+public class VNode extends AbstractGraphicalObject implements Node {
+
+  private final String type;
+
+  private final MutableList<Connector> connectors = Lists.mutable.empty();
+
+  @Override
+  public List<Connector> connectors() {
+    return connectors.asUnmodifiable();
+  }
+
+  @Override
+  public void addConnector(Connector connector) {
+    connectors.add(connector);
+  }
+
+  @Override
+  public String type() {
+    return type;
+  }
+}
diff --git a/visual-data-structure/src/main/java/org/visual/data/structure/style/VisualDataStructureStyle.java b/visual-data-structure/src/main/java/org/visual/data/structure/style/VisualDataStructureStyle.java
index 278f464..f177c40 100644
--- a/visual-data-structure/src/main/java/org/visual/data/structure/style/VisualDataStructureStyle.java
+++ b/visual-data-structure/src/main/java/org/visual/data/structure/style/VisualDataStructureStyle.java
@@ -11,9 +11,9 @@
 @Target({ElementType.PACKAGE, ElementType.TYPE})
 @Retention(RetentionPolicy.CLASS)
 @Value.Style(
-  typeImmutable = "Visual*",
+  typeImmutable = "V*",
   visibility = Value.Style.ImplementationVisibility.PUBLIC,
-  stagedBuilder = true,
+  strictBuilder = true,
   jdk9Collections = true
 )
 @JsonSerialize
diff --git a/visual-editor/build.gradle.kts b/visual-editor/build.gradle.kts
index bbf10a5..0f8b7e0 100644
--- a/visual-editor/build.gradle.kts
+++ b/visual-editor/build.gradle.kts
@@ -6,14 +6,23 @@ group = "org.visual.editor"
 
 version = "unspecified"
 
-dependencies { compileOnly(libs.jetbrains.annotation) }
+dependencies {
+  compileOnly(libs.jetbrains.annotation)
+  implementation(projects.visualDataStructure)
+  implementation(libs.record.builder.core)
+  implementation(libs.eclipse.collections.api)
+  implementation(libs.eclipse.collections)
+  annotationProcessor(libs.record.builder.processor)
+  compileOnly(libs.immutables.value)
+  annotationProcessor(libs.immutables.value)
+}
 
 javafx {
   modules(*javafxModules.toTypedArray())
-  version = "23"
+  version = libs.versions.javafx.get()
   configurations =
     arrayOf(
-      IMPLEMENTATION,
+      COMPILE_ONLY,
       TEST_IMPLEMENTATION,
     )
 }
\ No newline at end of file
diff --git a/visual-editor/src/main/java/module-info.java b/visual-editor/src/main/java/module-info.java
index 1954c96..81342cf 100644
--- a/visual-editor/src/main/java/module-info.java
+++ b/visual-editor/src/main/java/module-info.java
@@ -1,6 +1,15 @@
 module org.visual.editor {
   requires static lombok;
-  requires org.jetbrains.annotations;
-  requires org.slf4j;
+  requires static org.jetbrains.annotations;
   requires javafx.controls;
+  requires org.slf4j;
+  requires java.compiler;
+  requires org.visual.data.structure;
+  requires static org.immutables.value;
+
+  requires org.eclipse.collections.api;
+
+  exports org.visual.editor.view.model;
+  exports org.visual.editor.view;
+  exports org.visual.editor.core;
 }
\ No newline at end of file
diff --git a/visual-editor/src/main/java/org/visual/editor/PanningWindow.java b/visual-editor/src/main/java/org/visual/editor/PanningWindow.java
deleted file mode 100644
index defaba3..0000000
--- a/visual-editor/src/main/java/org/visual/editor/PanningWindow.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright (C) 2005 - 2014 by TESIS DYNAware GmbH
- */
-package org.visual.editor;
-
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.collections.ObservableList;
-import javafx.event.Event;
-import javafx.event.EventHandler;
-import javafx.geometry.Orientation;
-import javafx.geometry.Point2D;
-import javafx.geometry.Pos;
-import javafx.scene.Cursor;
-import javafx.scene.Node;
-import javafx.scene.control.ScrollBar;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.input.TouchEvent;
-import javafx.scene.input.ZoomEvent;
-import javafx.scene.layout.Region;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.transform.Scale;
-import lombok.extern.slf4j.Slf4j;
-import lombok.val;
-import org.jetbrains.annotations.NotNull;
-
-@Slf4j
-public class PanningWindow extends Region {
-
-    private static final float SCALE_MIN = 0.5f;
-    private static final float SCALE_MAX = 1.5f;
-
-    private Region content;
-
-    private final DoubleProperty contentX = new SimpleDoubleProperty() {
-
-        @Override
-        protected void invalidated() {
-            requestLayout();
-        }
-    };
-    private final DoubleProperty contentY = new SimpleDoubleProperty() {
-
-        @Override
-        protected void invalidated() {
-            requestLayout();
-        }
-    };
-    private final ScrollBar scrollX = new ScrollBar();
-    private final ScrollBar scrollY = new ScrollBar();
-
-    private final EventHandler<MouseEvent> mousePressedHandler = this::handlePanningMousePressed;
-    private final EventHandler<MouseEvent> mouseDraggedHandler = this::handlePanningMouseDragged;
-    private final EventHandler<MouseEvent> mouseReleasedHandler = this::handlePanningMouseReleased;
-
-    private final EventHandler<TouchEvent> touchPressedHandler = this::handlePanningTouchPressed;
-    private final EventHandler<TouchEvent> touchDraggedHandler = this::handlePanningTouchDragged;
-    private final EventHandler<TouchEvent> touchReleasedHandler = this::handlePanningFinished;
-
-    private final EventHandler<ZoomEvent> zoomHandler = this::handleZoom;
-    private final EventHandler<ScrollEvent> scrollHandler = this::handleScroll;
-
-    private Point2D clickPosition;
-    private Point2D windowPosAtClick;
-
-    private final DoubleProperty zoom = new SimpleDoubleProperty(1);
-    private final Scale scale = new Scale();
-
-//    private GraphEditorProperties properties;
-
-    public PanningWindow() {
-        val clip = new Rectangle();
-        clip.widthProperty().bind(widthProperty());
-        clip.heightProperty().bind(heightProperty());
-        setClip(clip);
-
-        scale.xProperty().bind(zoom);
-        scale.yProperty().bind(zoom);
-
-        getChildren().addAll(scrollX, scrollY);
-
-        scrollX.setOrientation(Orientation.HORIZONTAL);
-        scrollX.valueProperty().bindBidirectional(contentX);
-        scrollX.getStyleClass().add("graph-editor-scroll-bar"); //$NON-NLS-1$
-
-        scrollY.valueProperty().bindBidirectional(contentY);
-        scrollY.setOrientation(Orientation.VERTICAL);
-        scrollY.getStyleClass().add("graph-editor-scroll-bar"); //$NON-NLS-1$
-    }
-
-    public void setEditorProperties(
-//      final GraphEditorProperties pEditorProperties
-    ) {
-//        properties = pEditorProperties;
-    }
-
-    public void panTo(final double x, final double y) {
-        panToX(x);
-        panToY(y);
-    }
-
-
-    private boolean canNotPanX() {
-        return content == null || content.getWidth() < getWidth();
-    }
-
-    private boolean canNotPanY() {
-        return content == null || content.getHeight() < getHeight();
-    }
-
-    public void panToX(final double x) {
-        if (canNotPanX()) {
-            return;
-        }
-
-        final double newX = checkContentX(x);
-        if (newX != getContentX()) {
-            contentX.set(newX);
-        }
-    }
-
-    public void panToY(final double y) {
-        if (canNotPanY()) {
-            return;
-        }
-
-        final double newY = checkContentY(y);
-        if (newY != contentY.get()) {
-            contentY.set(newY);
-        }
-    }
-
-    public void panTo(final @NotNull Pos position) {
-        double x = 0;
-        double y = 0;
-
-        switch (position.getHpos()) {
-            case LEFT -> x = 0;
-            case CENTER -> x = (content.getWidth() - getWidth()) / 2;
-            case RIGHT -> x = content.getWidth() - getWidth();
-            default -> {
-            }
-        }
-
-        switch (position.getVpos()) {
-            case TOP -> y = 0;
-            case CENTER -> y = (content.getHeight() - getHeight()) / 2;
-            case BOTTOM -> y = content.getHeight() - getHeight();
-            default -> {
-            }
-        }
-
-        contentX.set(x);
-        contentY.set(y);
-
-        checkWindowBounds();
-    }
-
-    /**
-     * @return the x coordinate of the window relative to the top-left corner of
-     *         the content.
-     */
-    public double getContentX() {
-        return contentX.get();
-    }
-
-    /**
-     * @return the y coordinate of the window relative to the top-left corner of
-     *         the content.
-     */
-    public double getContentY() {
-        return contentY.get();
-    }
-
-    /**
-     * @return {@link DoubleProperty} with the current zoom level
-     * @since 14.11.2018
-     */
-    public DoubleProperty zoomProperty() {
-        return zoom;
-    }
-
-    /**
-     * Set new zoom level without moving the viewport
-     *
-     * @param pZoom
-     *            new zoom factor
-     */
-    public void setZoom(final double pZoom) {
-        setZoomAt(pZoom, getContentX(), getContentY());
-    }
-
-    /**
-     * Zoom at the given location
-     *
-     * @param pZoom
-     *            new zoom factor
-     * @param pPivotX
-     *            the X coordinate about which point the scale occurs
-     * @param pPivotY
-     *            the Y coordinate about which point the scale occurs
-     */
-    public void setZoomAt(final double pZoom, final double pPivotX, final double pPivotY) {
-        final double oldZoomLevel = getZoom();
-        final double newZoomLevel = constrainZoom(pZoom);
-
-        if (newZoomLevel != oldZoomLevel) {
-            final double f = newZoomLevel / oldZoomLevel - 1;
-            zoom.set(newZoomLevel);
-            panTo(getContentX() + f * pPivotX, getContentY() + f * pPivotY);
-        }
-    }
-
-    /**
-     * @return current zoom factor
-     */
-    public double getZoom() {
-        return zoom.get();
-    }
-
-    @Override
-    protected void layoutChildren() {
-        super.layoutChildren();
-        final double height = getHeight();
-        final double width = getWidth();
-        final Node theContent = content;
-
-        if (theContent != null) {
-            theContent.relocate(-contentX.get(), -contentY.get());
-        }
-
-        val w = scrollY.getWidth();
-        val h = scrollX.getHeight();
-
-        scrollX.resizeRelocate(0, snapPositionY(height - h), snapSizeX(width - w), h);
-        scrollY.resizeRelocate(snapPositionX(width - w), 0, w, snapSizeY(height - h));
-
-        final double zoomFactor = theContent == null ? 1 : theContent.getLocalToSceneTransform().getMxx();
-        scrollX.setMin(0);
-        scrollX.setMax(getMaxX());
-        scrollX.setVisibleAmount(zoomFactor * width);
-        scrollY.setMin(0);
-        scrollY.setMax(getMaxY());
-        scrollY.setVisibleAmount(zoomFactor * height);
-    }
-
-    private static double constrainZoom(final double pZoom) {
-        final double zoom = Math.round(pZoom * 100.0) / 100.0;
-        if (zoom <= 1.02 && zoom >= 0.98) {
-            return 1.0;
-        }
-        return Math.min(Math.max(zoom, SCALE_MIN), SCALE_MAX);
-    }
-
-    /**
-     * Checks that the window bounds are completely inside the content bounds,
-     * and repositions if necessary.
-     *
-     * <p>
-     * Also checks that the window position values are integers to ensure
-     * strokes are drawn cleanly.
-     * </p>
-     */
-    protected void checkWindowBounds() {
-        panTo(getContentX(), getContentY());
-    }
-
-    private double getMaxX() {
-        final Region theContent = content;
-        if (theContent != null) {
-            final double zoomFactor = theContent.getLocalToSceneTransform().getMxx();
-            return zoomFactor * theContent.getWidth() - getWidth();
-        }
-        return 0;
-    }
-
-    private double getMaxY() {
-        final Region theContent = content;
-        if (theContent != null) {
-            final double zoomFactor = theContent.getLocalToSceneTransform().getMxx();
-            return zoomFactor * theContent.getHeight() - getHeight();
-        }
-        return 0;
-    }
-
-    private double checkContentX(final double xToCheck) {
-        return snapPositionX(Math.min(getMaxX(), Math.max(xToCheck, 0)));
-    }
-
-    private double checkContentY(final double yToCheck) {
-        return snapPositionY(Math.min(getMaxY(), Math.max(yToCheck, 0)));
-    }
-
-    @Override
-    public ObservableList<Node> getChildren() {
-        return super.getChildren();
-    }
-
-    /**
-     * Sets the content of the panning window.
-     *
-     * <p>
-     * Note that the content's {@code managed} attribute will be set to false.
-     * Its size must therefore be set manually using the {@code resize()} method
-     * of the {@link Node} class.
-     * </p>
-     *
-     * @param pContent
-     *            the {@link Region} to be displayed inside the panning window
-     */
-    protected void setContent(final Region pContent) {
-        // Remove children and release bindings from old content, if any exists.
-        final Region prevContent = content;
-        if (prevContent != null) {
-            removeMouseHandlersFromContent(prevContent);
-            getChildren().remove(prevContent);
-            prevContent.getTransforms().remove(scale);
-        }
-
-        content = pContent;
-
-        if (pContent != null) {
-            pContent.setManaged(false);
-            getChildren().add(pContent);
-            addMouseHandlersToContent(pContent);
-            pContent.getTransforms().add(scale);
-
-            scrollX.setVisible(true);
-            scrollY.setVisible(true);
-        } else {
-            scrollX.setVisible(false);
-            scrollY.setVisible(false);
-        }
-    }
-
-    private void handlePanningMousePressed(final MouseEvent event) {
-        startPanning(event.getScreenX(), event.getScreenY());
-//        if (properties != null && properties.activateGesture(GraphInputGesture.PAN, event, this))
-//        {
-//            startPanning(event.getScreenX(), event.getScreenY());
-//        }
-    }
-
-    /**
-     * Handle mouse released event
-     *
-     * @param pEvent
-     *            {@link MouseEvent}
-     */
-    protected void handlePanningMouseReleased(final MouseEvent pEvent) {
-        handlePanningFinished(pEvent);
-    }
-
-    private void handlePanningMouseDragged(final MouseEvent event) {
-        if (!Cursor.MOVE.equals(getCursor())) {
-            startPanning(event.getScreenX(), event.getScreenY());
-        }
-
-        final double deltaX = event.getScreenX() - clickPosition.getX();
-        final double deltaY = event.getScreenY() - clickPosition.getY();
-
-        final double newWindowX = windowPosAtClick.getX() - deltaX;
-        final double newWindowY = windowPosAtClick.getY() - deltaY;
-
-        panTo(newWindowX, newWindowY);
-//        if (properties != null && properties.activateGesture(GraphInputGesture.PAN, event, this))
-//        {
-//
-//        }
-    }
-
-    private void handlePanningFinished(final Event event) {
-        setCursor(null);
-        event.consume();
-//        if (properties != null && properties.finishGesture(GraphInputGesture.PAN, this))
-//        {
-//
-//        }
-    }
-
-    private void handlePanningTouchPressed(final TouchEvent event) {
-        startPanning(event.getTouchPoint().getScreenX(), event.getTouchPoint().getScreenY());
-
-//        if (properties != null && properties.activateGesture(GraphInputGesture.PAN, event, this))
-//        {
-//        }
-    }
-
-    private void handlePanningTouchDragged(final TouchEvent event) {
-        if (!Cursor.MOVE.equals(getCursor())) {
-            startPanning(event.getTouchPoint().getScreenX(), event.getTouchPoint().getScreenY());
-        }
-
-        final double deltaX = event.getTouchPoint().getScreenX() - clickPosition.getX();
-        final double deltaY = event.getTouchPoint().getScreenY() - clickPosition.getY();
-
-        final double newWindowX = windowPosAtClick.getX() - deltaX;
-        final double newWindowY = windowPosAtClick.getY() - deltaY;
-
-        panTo(newWindowX, newWindowY);
-//        if (properties != null && properties.activateGesture(GraphInputGesture.PAN, event, this)) {
-//
-//        }
-    }
-
-    private void handleScroll(final ScrollEvent pEvent) {
-        // this intended for mouse-scroll events (event direct == false)
-        // the event also gets synthesized from touch events, which we want to ignore as they are handled in handleZoom()
-//        if (pEvent.isDirect() || pEvent.getTouchCount() > 0 || properties == null) {
-//            return;
-//        }
-//
-//        if (properties.activateGesture(GraphInputGesture.ZOOM, pEvent, this)) {
-//            try {
-//                final double modifier = pEvent.getDeltaY() > 1 ? 0.06 : -0.06;
-//                setZoomAt(getZoom() + modifier, pEvent.getX(), pEvent.getY());
-//                pEvent.consume();
-//            } finally {
-//                properties.finishGesture(GraphInputGesture.ZOOM, this);
-//            }
-//        } else if (properties.activateGesture(GraphInputGesture.PAN, pEvent, this)) {
-//            try {
-//                panTo(getContentX() - pEvent.getDeltaX(), getContentY() - pEvent.getDeltaY());
-//                pEvent.consume();
-//            } finally {
-//                properties.finishGesture(GraphInputGesture.PAN, this);
-//            }
-//        }
-    }
-
-    private void handleZoom(final ZoomEvent pEvent) {
-//        if (properties == null) {
-//            return;
-//        }
-//
-//        if (pEvent.getEventType() == ZoomEvent.ZOOM_STARTED && properties.activateGesture(GraphInputGesture.ZOOM, pEvent, this)) {
-//            pEvent.consume();
-//        } else if (pEvent.getEventType() == ZoomEvent.ZOOM_FINISHED && properties.finishGesture(GraphInputGesture.ZOOM, this)) {
-//            pEvent.consume();
-//        } else if (pEvent.getEventType() == ZoomEvent.ZOOM && properties.activateGesture(GraphInputGesture.ZOOM, pEvent, this)) {
-//            final double newZoomLevel = getZoom() * pEvent.getZoomFactor();
-//            setZoomAt(newZoomLevel, pEvent.getX(), pEvent.getY());
-//            pEvent.consume();
-//        }
-    }
-
-    private void addMouseHandlersToContent(final Node pContent) {
-        pContent.addEventHandler(MouseEvent.MOUSE_PRESSED, mousePressedHandler);
-        pContent.addEventHandler(MouseEvent.MOUSE_DRAGGED, mouseDraggedHandler);
-
-        pContent.addEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedHandler);
-        // sometimes MOUSE_RELEASED is not delivered but the MOUSE_CLICKED..
-        pContent.addEventHandler(MouseEvent.MOUSE_CLICKED, mouseReleasedHandler);
-
-        pContent.addEventHandler(TouchEvent.TOUCH_PRESSED, touchPressedHandler);
-        pContent.addEventHandler(TouchEvent.TOUCH_MOVED, touchDraggedHandler);
-        pContent.addEventHandler(TouchEvent.TOUCH_RELEASED, touchReleasedHandler);
-
-        pContent.addEventHandler(ZoomEvent.ANY, zoomHandler);
-        pContent.addEventHandler(ScrollEvent.SCROLL, scrollHandler);
-    }
-
-    private void removeMouseHandlersFromContent(final @NotNull Node pContent) {
-        pContent.removeEventHandler(MouseEvent.MOUSE_PRESSED, mousePressedHandler);
-        pContent.removeEventHandler(MouseEvent.MOUSE_DRAGGED, mouseDraggedHandler);
-
-        pContent.removeEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedHandler);
-        // sometimes MOUSE_RELEASED is not delivered but the MOUSE_CLICKED..
-        pContent.removeEventHandler(MouseEvent.MOUSE_CLICKED, mouseReleasedHandler);
-
-        pContent.removeEventHandler(TouchEvent.TOUCH_PRESSED, touchPressedHandler);
-        pContent.removeEventHandler(TouchEvent.TOUCH_MOVED, touchDraggedHandler);
-        pContent.removeEventHandler(TouchEvent.TOUCH_RELEASED, touchReleasedHandler);
-
-        pContent.removeEventHandler(ZoomEvent.ANY, zoomHandler);
-        pContent.removeEventHandler(ScrollEvent.SCROLL, scrollHandler);
-    }
-
-    private void startPanning(final double x, final double y) {
-        setCursor(Cursor.MOVE);
-
-        clickPosition = new Point2D(x, y);
-        windowPosAtClick = new Point2D(getContentX(), getContentY());
-    }
-}
diff --git a/visual-editor/src/main/java/org/visual/editor/api/Command.java b/visual-editor/src/main/java/org/visual/editor/api/Command.java
new file mode 100644
index 0000000..e455cf9
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/api/Command.java
@@ -0,0 +1,9 @@
+package org.visual.editor.api;
+
+public interface Command {
+  default boolean canExecute(){
+    return true;
+  }
+  void execute();
+  void undo();
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/api/CommandManager.java b/visual-editor/src/main/java/org/visual/editor/api/CommandManager.java
new file mode 100644
index 0000000..dd8bb2e
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/api/CommandManager.java
@@ -0,0 +1,11 @@
+package org.visual.editor.api;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface CommandManager {
+  void executeCommand(@NotNull Command command);
+
+  void undo();
+
+  void redo();
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/api/ConnectionLayouter.java b/visual-editor/src/main/java/org/visual/editor/api/ConnectionLayouter.java
new file mode 100644
index 0000000..8da2c3c
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/api/ConnectionLayouter.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2005 - 2014 by TESIS DYNAware GmbH
+ */
+package org.visual.editor.api;
+
+
+import org.visual.data.structure.graph.Model;
+
+/**
+ * Responsible for telling connection skins to draw themselves.
+ */
+public interface ConnectionLayouter
+{
+
+    void initialize(final Model model);
+
+    void draw();
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/api/Editor.java b/visual-editor/src/main/java/org/visual/editor/api/Editor.java
new file mode 100644
index 0000000..536abac
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/api/Editor.java
@@ -0,0 +1,8 @@
+package org.visual.editor.api;
+
+import javafx.scene.layout.Region;
+
+public interface Editor {
+
+  Region view();
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/command/AddCommand.java b/visual-editor/src/main/java/org/visual/editor/command/AddCommand.java
new file mode 100644
index 0000000..92903d6
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/command/AddCommand.java
@@ -0,0 +1,32 @@
+package org.visual.editor.command;
+
+import lombok.Builder;
+import lombok.extern.slf4j.Slf4j;
+import org.visual.data.structure.graph.Model;
+import org.visual.data.structure.graph.Node;
+import org.visual.editor.api.Command;
+
+import java.util.Objects;
+
+@Builder
+@Slf4j
+public class AddCommand implements Command {
+
+  private final Model model;
+  private final Node node;
+
+  @Override
+  public boolean canExecute() {
+    return Objects.nonNull(model);
+  }
+
+  @Override
+  public void execute() {
+    model.addNode(node);
+  }
+
+  @Override
+  public void undo() {
+    model.removeNode(node);
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/command/CompoundCommand.java b/visual-editor/src/main/java/org/visual/editor/command/CompoundCommand.java
new file mode 100644
index 0000000..34196d8
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/command/CompoundCommand.java
@@ -0,0 +1,43 @@
+package org.visual.editor.command;
+
+import lombok.Builder;
+import lombok.Singular;
+import lombok.extern.slf4j.Slf4j;
+import org.visual.editor.api.Command;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.IntStream;
+
+@Slf4j
+@Builder
+public class CompoundCommand implements Command {
+
+  @Singular
+  private final List<Command> commands;
+
+  private final List<Command> executedCommands = new ArrayList<>();
+
+  @Override
+  public boolean canExecute() {
+    return commands.stream().allMatch(Command::canExecute);
+  }
+
+  @Override
+  public void execute() {
+    if (!canExecute()) {
+      throw new IllegalStateException("Cannot execute compound command: one or more commands cannot be executed.");
+    }
+
+    commands.forEach(command -> {
+      command.execute();
+      executedCommands.add(command);
+    });
+  }
+
+  @Override
+  public void undo() {
+    IntStream.iterate(executedCommands.size() - 1, i -> i >= 0, i -> i - 1).forEachOrdered(i -> executedCommands.get(i).undo());
+    executedCommands.clear();
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/command/DefaultCommandManager.java b/visual-editor/src/main/java/org/visual/editor/command/DefaultCommandManager.java
new file mode 100644
index 0000000..e43db6d
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/command/DefaultCommandManager.java
@@ -0,0 +1,41 @@
+package org.visual.editor.command;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Stacks;
+import org.eclipse.collections.api.stack.MutableStack;
+import org.jetbrains.annotations.NotNull;
+import org.visual.editor.api.Command;
+import org.visual.editor.api.CommandManager;
+
+@Slf4j
+public class DefaultCommandManager implements CommandManager {
+  private final MutableStack<Command> undoStack = Stacks.mutable.empty();
+  private final MutableStack<Command> redoStack = Stacks.mutable.empty();
+
+  @Override
+  public void executeCommand(@NotNull Command command) {
+    command.execute();
+    undoStack.push(command);
+    redoStack.clear();
+  }
+
+  @Override
+  public void undo() {
+    if (undoStack.isEmpty()) {
+      return;
+    }
+    Command command = undoStack.pop();
+    command.undo();
+    redoStack.push(command);
+  }
+
+  @Override
+  public void redo() {
+    if (redoStack.isEmpty()) {
+      return;
+    }
+    Command command = redoStack.pop();
+    command.execute();
+    undoStack.push(command);
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/command/RemoveConnectionCommand.java b/visual-editor/src/main/java/org/visual/editor/command/RemoveConnectionCommand.java
new file mode 100644
index 0000000..998effa
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/command/RemoveConnectionCommand.java
@@ -0,0 +1,22 @@
+package org.visual.editor.command;
+
+import lombok.Builder;
+import lombok.extern.slf4j.Slf4j;
+import org.visual.data.structure.graph.Node;
+import org.visual.editor.api.Command;
+
+@Slf4j
+@Builder
+public class RemoveConnectionCommand implements Command {
+
+  private final Node node;
+
+  @Override
+  public void execute() {
+  }
+
+  @Override
+  public void undo() {
+
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/command/RemoveNodeCommand.java b/visual-editor/src/main/java/org/visual/editor/command/RemoveNodeCommand.java
new file mode 100644
index 0000000..6ec6bae
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/command/RemoveNodeCommand.java
@@ -0,0 +1,26 @@
+package org.visual.editor.command;
+
+import lombok.Builder;
+import lombok.extern.slf4j.Slf4j;
+import org.visual.data.structure.graph.Model;
+import org.visual.data.structure.graph.Node;
+import org.visual.editor.api.Command;
+
+@Builder
+@Slf4j
+public class RemoveNodeCommand implements Command {
+
+  private final Model model;
+
+  private final Node node;
+
+  @Override
+  public void execute() {
+    model.removeNode(node);
+  }
+
+  @Override
+  public void undo() {
+    model.addNode(node);
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/constant/EditorElement.java b/visual-editor/src/main/java/org/visual/editor/constant/EditorElement.java
new file mode 100644
index 0000000..97ffab3
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/constant/EditorElement.java
@@ -0,0 +1,11 @@
+package org.visual.editor.constant;
+
+/**
+ * Enumeration listing elements of the graph editor
+ */
+public enum EditorElement
+{
+    CONNECTOR,
+    NODE,
+    JOINT;
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/constant/Style.java b/visual-editor/src/main/java/org/visual/editor/constant/Style.java
new file mode 100644
index 0000000..eac5f28
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/constant/Style.java
@@ -0,0 +1,8 @@
+package org.visual.editor.constant;
+
+public interface Style {
+  String STYLE_CLASS = "graph-editor";
+  String STYLE_CLASS_NODE_LAYER = "graph-editor-node-layer";
+  String STYLE_CLASS_CONNECTION_LAYER = "graph-editor-connection-layer";
+
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/core/VisualEditor.java b/visual-editor/src/main/java/org/visual/editor/core/VisualEditor.java
new file mode 100644
index 0000000..fb13796
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/core/VisualEditor.java
@@ -0,0 +1,63 @@
+package org.visual.editor.core;
+
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.layout.Region;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.visual.data.structure.graph.Model;
+import org.visual.data.structure.graph.Node;
+import org.visual.data.structure.impl.VNode;
+import org.visual.editor.api.CommandManager;
+import org.visual.editor.api.Editor;
+import org.visual.editor.command.AddCommand;
+import org.visual.editor.command.CompoundCommand;
+import org.visual.editor.command.DefaultCommandManager;
+import org.visual.editor.view.EditorView;
+import org.visual.editor.view.model.EditorProperties;
+
+@Getter
+@Slf4j
+public class VisualEditor implements Editor {
+
+  private final EditorView view;
+
+  private final EditorProperties properties;
+
+  private final CommandManager commandManager;
+
+  private final ObjectProperty<Model> modelProperty = new SimpleObjectProperty<>();
+
+  public VisualEditor(EditorProperties properties) {
+    this.properties = properties;
+    this.view = new EditorView(properties);
+    this.commandManager = new DefaultCommandManager();
+  }
+
+  @Override
+  public Region view() {
+    return view;
+  }
+
+  public void addNode(Node node) {
+    val addCommand = AddCommand.builder()
+      .node(node)
+      .model(getModel())
+      .build();
+    commandManager.executeCommand(addCommand);
+  }
+
+  public void removeNode(Node node) {
+    val builder = CompoundCommand.builder();
+  }
+
+  public Model getModel() {
+    return modelProperty.get();
+  }
+
+  public void setModel(Model model) {
+    modelProperty.set(model);
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/util/EventUtils.java b/visual-editor/src/main/java/org/visual/editor/util/EventUtils.java
new file mode 100644
index 0000000..2fc9a2f
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/util/EventUtils.java
@@ -0,0 +1,36 @@
+package org.visual.editor.util;
+
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
+import javafx.scene.Node;
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+import org.visual.data.structure.impl.VNode;
+
+import java.util.Map;
+
+import static java.util.Objects.nonNull;
+
+
+/**
+ * Helper methods for JavaFX event handling
+ */
+@UtilityClass
+public class EventUtils {
+
+  public <N extends Node, T extends Event> void removeEventHandlers(
+    final @NotNull Map<N, EventHandler<T>> pEventHandlers,
+    final EventType<T> pType
+  ) {
+    pEventHandlers.entrySet().stream()
+      .filter(entry ->
+        nonNull(entry.getKey()) && nonNull(entry.getValue())
+      )
+      .forEach(entry ->
+        entry.getKey().removeEventHandler(pType, entry.getValue())
+      );
+    pEventHandlers.clear();
+  }
+
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/view/AutoScrollingWindow.java b/visual-editor/src/main/java/org/visual/editor/view/AutoScrollingWindow.java
new file mode 100644
index 0000000..ed75cd6
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/view/AutoScrollingWindow.java
@@ -0,0 +1,178 @@
+package org.visual.editor.view;
+
+import javafx.animation.Animation;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.geometry.Point2D;
+import javafx.scene.Node;
+import javafx.scene.control.ScrollBar;
+import javafx.scene.input.MouseEvent;
+import javafx.util.Duration;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An extension of {@link PanningWindow} that adds an auto-scrolling mechanism.
+ *
+ * <p>
+ * The auto-scrolling occurs when the mouse is dragged to the edge of the window. The scrolling rate increases the
+ * longer the cursor is outside the window.
+ * </p>
+ */
+@Slf4j
+public class AutoScrollingWindow extends PanningWindow {
+  private static final Duration JUMP_PERIOD = Duration.millis(25);
+
+  private final double baseJumpAmount = 1;
+  private final double maxJumpAmount = 50;
+  private final double jumpAmountIncreasePerJump = 0.5;
+  private final double insetToBeginScroll = 1;
+
+  private Timeline timeline;
+  private Boolean isScrolling;
+  private Point2D jumpDistance;
+
+  @Setter
+  @Getter
+  private boolean autoScrollingEnabled = true;
+  private int jumpsTaken;
+
+  /**
+   * Creates a new {@link AutoScrollingWindow}.
+   */
+  public AutoScrollingWindow() {
+    addEventFilter(MouseEvent.MOUSE_DRAGGED, this::handleMouseDragged);
+  }
+
+  @Override
+  protected void handlePanningMouseReleased(MouseEvent pEvent) {
+    super.handlePanningMouseReleased(pEvent);
+    endScrolling();
+  }
+
+  /**
+   * Handles mouse-dragged events.
+   *
+   * @param event the mouse-dragged event object
+   */
+  private void handleMouseDragged(final @NotNull MouseEvent event) {
+    if (!event.isPrimaryButtonDown() || !(event.getTarget() instanceof Node) || isScrollBar(event)) {
+      return;
+    }
+    jumpDistance = getDistanceToJump(event.getX(), event.getY());
+
+    if (jumpDistance == null) {
+      jumpsTaken = 0;
+    } else if (!isScrolling && isAutoScrollingEnabled()) {
+      startScrolling();
+    }
+  }
+
+  private boolean isScrollBar(final @NotNull MouseEvent pEvent) {
+    if (!(pEvent.getTarget() instanceof Node node)) {
+      return false;
+    }
+    var n = node;
+    while (n != null) {
+      if (n instanceof ScrollBar) {
+        return true;
+      }
+      n = n.getParent();
+    }
+    return false;
+  }
+
+  /**
+   * Gets the distance to jump based on the current cursor position.
+   *
+   * <p>
+   * Returns null if the cursor is inside the window and no auto-scrolling should occur.
+   * </p>
+   *
+   * @param cursorX the cursor-x position in this {@link PanningWindow}
+   * @param cursorY the cursor-y position in this {@link PanningWindow}
+   * @return the distance to jump, or null if no jump should occur
+   */
+  private Point2D getDistanceToJump(final double cursorX, final double cursorY) {
+    double jumpX = 0;
+    double jumpY = 0;
+
+    val baseAmount = baseJumpAmount;
+    val additionalAmount = jumpsTaken * jumpAmountIncreasePerJump;
+    val distance = Math.min(baseAmount + additionalAmount, maxJumpAmount);
+
+    if (cursorX <= insetToBeginScroll) {
+      jumpX = -distance;
+    } else if (cursorX >= getWidth() - insetToBeginScroll) {
+      jumpX = distance;
+    }
+
+    if (cursorY <= insetToBeginScroll) {
+      jumpY = -distance;
+    } else if (cursorY >= getHeight() - insetToBeginScroll) {
+      jumpY = distance;
+    }
+
+    if (jumpX == 0 && jumpY == 0) {
+      return null;
+    }
+    return new Point2D(Math.round(jumpX), Math.round(jumpY));
+  }
+
+  /**
+   * Pans the window by the specified x and y values.
+   *
+   * <p>
+   * The window cannot be panned outside the content. When the window 'hits
+   * the edge' of the content it will stop.
+   * </p>
+   *
+   * @param x
+   *            the horizontal distance to move the window by
+   * @param y
+   *            the vertical distance to move the window by
+   */
+  private void panBy(final double x, final double y) {
+    if (x != 0 && y != 0) {
+      panTo(getContentX() + x, getContentY() + y);
+    } else if (x != 0) {
+      panToX(getContentX() + x);
+    } else if (y != 0) {
+      panToY(getContentY() + y);
+    }
+  }
+
+  /**
+   * Starts the auto-scrolling.
+   */
+  private void startScrolling() {
+    isScrolling = true;
+    jumpsTaken = 0;
+
+    final KeyFrame frame = new KeyFrame(JUMP_PERIOD, event -> {
+      if (isScrolling && jumpDistance != null) {
+        panBy(jumpDistance.getX(), jumpDistance.getY());
+        jumpsTaken++;
+      }
+    });
+
+    timeline = new Timeline();
+    timeline.setCycleCount(Animation.INDEFINITE);
+    timeline.getKeyFrames().add(frame);
+    timeline.play();
+  }
+
+  /**
+   * Stops the auto-scrolling.
+   */
+  private void endScrolling() {
+    isScrolling = false;
+
+    if (timeline != null) {
+      timeline.stop();
+    }
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/view/ConnectionLayer.java b/visual-editor/src/main/java/org/visual/editor/view/ConnectionLayer.java
new file mode 100644
index 0000000..6fc0080
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/view/ConnectionLayer.java
@@ -0,0 +1,6 @@
+package org.visual.editor.view;
+
+import javafx.scene.layout.Pane;
+
+public class ConnectionLayer extends Pane {
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/view/EditorContainer.java b/visual-editor/src/main/java/org/visual/editor/view/EditorContainer.java
new file mode 100644
index 0000000..60bfb8e
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/view/EditorContainer.java
@@ -0,0 +1,72 @@
+package org.visual.editor.view;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ChangeListener;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.jetbrains.annotations.NotNull;
+import org.visual.data.structure.graph.Model;
+import org.visual.editor.core.VisualEditor;
+
+import static java.util.Optional.ofNullable;
+
+@Slf4j
+public class EditorContainer extends AutoScrollingWindow {
+
+  private final ObjectProperty<VisualEditor> visualEditor = new SimpleObjectProperty<>();
+
+  public void setVisualEditor(@NonNull VisualEditor editor) {
+    visualEditor.set(editor);
+  }
+
+  private final ChangeListener<Model> modelChangeListener = (observable, oldValue, newValue) -> modelChanged(newValue);
+
+  public EditorContainer() {
+    visualEditor.addListener((observable, oldValue, newValue) -> {
+      clearEditorState(oldValue);
+      setupEditorState(newValue);
+    });
+  }
+
+  private void modelChanged(Model newValue) {
+//      graphEditor.getView().resize(newValue.getContentWidth(), newValue.getContentHeight());
+//    checkWindowBounds();
+//    minimap.setModel(newValue);
+  }
+
+  private void clearEditorState(@NotNull VisualEditor editor) {
+    editor.getModelProperty().removeListener(modelChangeListener);
+    setEditorProperties(null);
+  }
+
+  private void setupEditorState(@NotNull VisualEditor editor) {
+    editor.getModelProperty().addListener(modelChangeListener);
+
+    val view = editor.getView();
+    val model = editor.getModel();
+
+    ofNullable(model)
+      .ifPresent(existsModel -> view.resize(model.getContentWidth(), model.getContentHeight()));
+
+    setContent(view);
+//    minimap.setContent(view);
+//    minimap.setModel(model);
+//    minimap.setSelectionManager(pGraphEditor.getSelectionManager());
+
+    view.toBack();
+
+    setEditorProperties(editor.getProperties());
+  }
+
+  @Override
+  protected void layoutChildren() {
+    super.layoutChildren();
+
+//    if (getChildren().contains(minimap))
+//    {
+//      minimap.relocate(getWidth() - (minimap.getWidth() + MINIMAP_INDENT), MINIMAP_INDENT);
+//    }
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/view/EditorView.java b/visual-editor/src/main/java/org/visual/editor/view/EditorView.java
new file mode 100644
index 0000000..d498316
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/view/EditorView.java
@@ -0,0 +1,35 @@
+package org.visual.editor.view;
+
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Region;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.visual.editor.view.model.EditorProperties;
+
+import static org.visual.editor.constant.Style.STYLE_CLASS;
+
+@Slf4j
+public class EditorView extends Region {
+
+  @Getter
+  private final EditorProperties editorProperties;
+  private final Pane nodeLayer = new NodeLayer();
+  private final Pane connectionLayer = new ConnectionLayer();
+  private final SelectionBox mSelectionBox = new SelectionBox();
+  private final GridBackground gridBackground = new GridBackground();
+
+  public EditorView(@NotNull EditorProperties properties) {
+    this.editorProperties = properties;
+    getStyleClass().addAll(STYLE_CLASS);
+    setMaxWidth(editorProperties.getMaxWidth());
+    setMaxHeight(editorProperties.getMaxHeight());
+    gridBackground.visibleProperty().bind(properties.getGridVisibleProperty());
+    gridBackground.getSpacing().bind(properties.getGridSpacingProperty());
+  }
+
+  public void clear() {
+    nodeLayer.getChildren().clear();
+    connectionLayer.getChildren().clear();
+  }
+}
diff --git a/visual-app/src/main/java/org/visual/app/component/GridBackground.java b/visual-editor/src/main/java/org/visual/editor/view/GridBackground.java
similarity index 97%
rename from visual-app/src/main/java/org/visual/app/component/GridBackground.java
rename to visual-editor/src/main/java/org/visual/editor/view/GridBackground.java
index c975c69..f95ff8e 100644
--- a/visual-app/src/main/java/org/visual/app/component/GridBackground.java
+++ b/visual-editor/src/main/java/org/visual/editor/view/GridBackground.java
@@ -1,4 +1,4 @@
-package org.visual.app.component;
+package org.visual.editor.view;
 
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.DoublePropertyBase;
@@ -8,6 +8,7 @@
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
 import javafx.util.Pair;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.jetbrains.annotations.Contract;
@@ -30,6 +31,7 @@ public class GridBackground extends Region {
   private double mLastHeight = -1;
   private final Path mGrid = new Path();
 
+  @Getter
   private final DoubleProperty spacing = new DoublePropertyBase(12) {
 
     @Override
diff --git a/visual-editor/src/main/java/org/visual/editor/view/NodeLayer.java b/visual-editor/src/main/java/org/visual/editor/view/NodeLayer.java
new file mode 100644
index 0000000..118478c
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/view/NodeLayer.java
@@ -0,0 +1,6 @@
+package org.visual.editor.view;
+
+import javafx.scene.layout.Pane;
+
+public class NodeLayer extends Pane {
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/view/PanningWindow.java b/visual-editor/src/main/java/org/visual/editor/view/PanningWindow.java
new file mode 100644
index 0000000..4612288
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/view/PanningWindow.java
@@ -0,0 +1,487 @@
+/*
+ * Copyright (C) 2005 - 2014 by TESIS DYNAware GmbH
+ */
+package org.visual.editor.view;
+
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.collections.ObservableList;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.geometry.Orientation;
+import javafx.geometry.Point2D;
+import javafx.geometry.Pos;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.control.ScrollBar;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.input.TouchEvent;
+import javafx.scene.input.ZoomEvent;
+import javafx.scene.layout.Region;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.transform.Scale;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.jetbrains.annotations.NotNull;
+import org.visual.editor.view.model.EditorProperties;
+
+@Slf4j
+public class PanningWindow extends Region {
+
+  private static final float SCALE_MIN = 0.5f;
+  private static final float SCALE_MAX = 1.5f;
+
+  private Region content;
+
+  private final DoubleProperty contentX = new SimpleDoubleProperty() {
+
+    @Override
+    protected void invalidated() {
+      requestLayout();
+    }
+  };
+  private final DoubleProperty contentY = new SimpleDoubleProperty() {
+
+    @Override
+    protected void invalidated() {
+      requestLayout();
+    }
+  };
+  private final ScrollBar scrollX = new ScrollBar();
+  private final ScrollBar scrollY = new ScrollBar();
+
+  private final EventHandler<MouseEvent> mousePressedHandler = this::handlePanningMousePressed;
+  private final EventHandler<MouseEvent> mouseDraggedHandler = this::handlePanningMouseDragged;
+  private final EventHandler<MouseEvent> mouseReleasedHandler = this::handlePanningMouseReleased;
+
+  private final EventHandler<TouchEvent> touchPressedHandler = this::handlePanningTouchPressed;
+  private final EventHandler<TouchEvent> touchDraggedHandler = this::handlePanningTouchDragged;
+  private final EventHandler<TouchEvent> touchReleasedHandler = this::handlePanningFinished;
+
+  private final EventHandler<ZoomEvent> zoomHandler = this::handleZoom;
+  private final EventHandler<ScrollEvent> scrollHandler = this::handleScroll;
+
+  private Point2D clickPosition;
+  private Point2D windowPosAtClick;
+
+  private final DoubleProperty zoom = new SimpleDoubleProperty(1);
+  private final Scale scale = new Scale();
+
+  private EditorProperties properties;
+
+  public PanningWindow() {
+    val clip = new Rectangle();
+    clip.widthProperty().bind(widthProperty());
+    clip.heightProperty().bind(heightProperty());
+    setClip(clip);
+
+    scale.xProperty().bind(zoom);
+    scale.yProperty().bind(zoom);
+
+    getChildren().addAll(scrollX, scrollY);
+
+    scrollX.setOrientation(Orientation.HORIZONTAL);
+    scrollX.valueProperty().bindBidirectional(contentX);
+    scrollX.getStyleClass().add("graph-editor-scroll-bar"); //$NON-NLS-1$
+
+    scrollY.valueProperty().bindBidirectional(contentY);
+    scrollY.setOrientation(Orientation.VERTICAL);
+    scrollY.getStyleClass().add("graph-editor-scroll-bar"); //$NON-NLS-1$
+  }
+
+  public void setEditorProperties(
+    final EditorProperties pEditorProperties
+  ) {
+    properties = pEditorProperties;
+  }
+
+  public void panTo(final double x, final double y) {
+    panToX(x);
+    panToY(y);
+  }
+
+
+  private boolean canNotPanX() {
+    return content == null || content.getWidth() < getWidth();
+  }
+
+  private boolean canNotPanY() {
+    return content == null || content.getHeight() < getHeight();
+  }
+
+  public void panToX(final double x) {
+    if (canNotPanX()) {
+      return;
+    }
+
+    final double newX = checkContentX(x);
+    if (newX != getContentX()) {
+      contentX.set(newX);
+    }
+  }
+
+  public void panToY(final double y) {
+    if (canNotPanY()) {
+      return;
+    }
+
+    final double newY = checkContentY(y);
+    if (newY != contentY.get()) {
+      contentY.set(newY);
+    }
+  }
+
+  public void panTo(final @NotNull Pos position) {
+    double x = 0;
+    double y = 0;
+
+    switch (position.getHpos()) {
+      case LEFT -> x = 0;
+      case CENTER -> x = (content.getWidth() - getWidth()) / 2;
+      case RIGHT -> x = content.getWidth() - getWidth();
+      default -> {
+      }
+    }
+
+    switch (position.getVpos()) {
+      case TOP -> y = 0;
+      case CENTER -> y = (content.getHeight() - getHeight()) / 2;
+      case BOTTOM -> y = content.getHeight() - getHeight();
+      default -> {
+      }
+    }
+
+    contentX.set(x);
+    contentY.set(y);
+
+    checkWindowBounds();
+  }
+
+  /**
+   * @return the x coordinate of the window relative to the top-left corner of
+   *         the content.
+   */
+  public double getContentX() {
+    return contentX.get();
+  }
+
+  /**
+   * @return the y coordinate of the window relative to the top-left corner of
+   *         the content.
+   */
+  public double getContentY() {
+    return contentY.get();
+  }
+
+  /**
+   * @return {@link DoubleProperty} with the current zoom level
+   * @since 14.11.2018
+   */
+  public DoubleProperty zoomProperty() {
+    return zoom;
+  }
+
+  /**
+   * Set new zoom level without moving the viewport
+   *
+   * @param pZoom
+   *            new zoom factor
+   */
+  public void setZoom(final double pZoom) {
+    setZoomAt(pZoom, getContentX(), getContentY());
+  }
+
+  /**
+   * Zoom at the given location
+   *
+   * @param pZoom
+   *            new zoom factor
+   * @param pPivotX
+   *            the X coordinate about which point the scale occurs
+   * @param pPivotY
+   *            the Y coordinate about which point the scale occurs
+   */
+  public void setZoomAt(final double pZoom, final double pPivotX, final double pPivotY) {
+    final double oldZoomLevel = getZoom();
+    final double newZoomLevel = constrainZoom(pZoom);
+
+    if (newZoomLevel != oldZoomLevel) {
+      final double f = newZoomLevel / oldZoomLevel - 1;
+      zoom.set(newZoomLevel);
+      panTo(getContentX() + f * pPivotX, getContentY() + f * pPivotY);
+    }
+  }
+
+  /**
+   * @return current zoom factor
+   */
+  public double getZoom() {
+    return zoom.get();
+  }
+
+  @Override
+  protected void layoutChildren() {
+    super.layoutChildren();
+    final double height = getHeight();
+    final double width = getWidth();
+    final Node theContent = content;
+
+    if (theContent != null) {
+      theContent.relocate(-contentX.get(), -contentY.get());
+    }
+
+    val w = scrollY.getWidth();
+    val h = scrollX.getHeight();
+
+    scrollX.resizeRelocate(0, snapPositionY(height - h), snapSizeX(width - w), h);
+    scrollY.resizeRelocate(snapPositionX(width - w), 0, w, snapSizeY(height - h));
+
+    final double zoomFactor = theContent == null ? 1 : theContent.getLocalToSceneTransform().getMxx();
+    scrollX.setMin(0);
+    scrollX.setMax(getMaxX());
+    scrollX.setVisibleAmount(zoomFactor * width);
+    scrollY.setMin(0);
+    scrollY.setMax(getMaxY());
+    scrollY.setVisibleAmount(zoomFactor * height);
+  }
+
+  private static double constrainZoom(final double pZoom) {
+    final double zoom = Math.round(pZoom * 100.0) / 100.0;
+    if (zoom <= 1.02 && zoom >= 0.98) {
+      return 1.0;
+    }
+    return Math.min(Math.max(zoom, SCALE_MIN), SCALE_MAX);
+  }
+
+  /**
+   * Checks that the window bounds are completely inside the content bounds,
+   * and repositions if necessary.
+   *
+   * <p>
+   * Also checks that the window position values are integers to ensure
+   * strokes are drawn cleanly.
+   * </p>
+   */
+  protected void checkWindowBounds() {
+    panTo(getContentX(), getContentY());
+  }
+
+  private double getMaxX() {
+    final Region theContent = content;
+    if (theContent != null) {
+      final double zoomFactor = theContent.getLocalToSceneTransform().getMxx();
+      return zoomFactor * theContent.getWidth() - getWidth();
+    }
+    return 0;
+  }
+
+  private double getMaxY() {
+    final Region theContent = content;
+    if (theContent != null) {
+      final double zoomFactor = theContent.getLocalToSceneTransform().getMxx();
+      return zoomFactor * theContent.getHeight() - getHeight();
+    }
+    return 0;
+  }
+
+  private double checkContentX(final double xToCheck) {
+    return snapPositionX(Math.min(getMaxX(), Math.max(xToCheck, 0)));
+  }
+
+  private double checkContentY(final double yToCheck) {
+    return snapPositionY(Math.min(getMaxY(), Math.max(yToCheck, 0)));
+  }
+
+  @Override
+  public ObservableList<Node> getChildren() {
+    return super.getChildren();
+  }
+
+  /**
+   * Sets the content of the panning window.
+   *
+   * <p>
+   * Note that the content's {@code managed} attribute will be set to false.
+   * Its size must therefore be set manually using the {@code resize()} method
+   * of the {@link Node} class.
+   * </p>
+   *
+   * @param pContent
+   *            the {@link Region} to be displayed inside the panning window
+   */
+  protected void setContent(final Region pContent) {
+    // Remove children and release bindings from old content, if any exists.
+    final Region prevContent = content;
+    if (prevContent != null) {
+      removeMouseHandlersFromContent(prevContent);
+      getChildren().remove(prevContent);
+      prevContent.getTransforms().remove(scale);
+    }
+
+    content = pContent;
+
+    if (pContent != null) {
+      pContent.setManaged(false);
+      getChildren().add(pContent);
+      addMouseHandlersToContent(pContent);
+      pContent.getTransforms().add(scale);
+
+      scrollX.setVisible(true);
+      scrollY.setVisible(true);
+    } else {
+      scrollX.setVisible(false);
+      scrollY.setVisible(false);
+    }
+  }
+
+  private void handlePanningMousePressed(final MouseEvent event) {
+    startPanning(event.getScreenX(), event.getScreenY());
+//        if (properties != null && properties.activateGesture(GraphInputGesture.PAN, event, this))
+//        {
+//            startPanning(event.getScreenX(), event.getScreenY());
+//        }
+  }
+
+  /**
+   * Handle mouse released event
+   *
+   * @param pEvent
+   *            {@link MouseEvent}
+   */
+  protected void handlePanningMouseReleased(final MouseEvent pEvent) {
+    handlePanningFinished(pEvent);
+  }
+
+  private void handlePanningMouseDragged(final MouseEvent event) {
+    if (!Cursor.MOVE.equals(getCursor())) {
+      startPanning(event.getScreenX(), event.getScreenY());
+    }
+
+    final double deltaX = event.getScreenX() - clickPosition.getX();
+    final double deltaY = event.getScreenY() - clickPosition.getY();
+
+    final double newWindowX = windowPosAtClick.getX() - deltaX;
+    final double newWindowY = windowPosAtClick.getY() - deltaY;
+
+    panTo(newWindowX, newWindowY);
+//        if (properties != null && properties.activateGesture(GraphInputGesture.PAN, event, this))
+//        {
+//
+//        }
+  }
+
+  private void handlePanningFinished(final Event event) {
+    setCursor(null);
+    event.consume();
+//        if (properties != null && properties.finishGesture(GraphInputGesture.PAN, this))
+//        {
+//
+//        }
+  }
+
+  private void handlePanningTouchPressed(final TouchEvent event) {
+    startPanning(event.getTouchPoint().getScreenX(), event.getTouchPoint().getScreenY());
+
+//        if (properties != null && properties.activateGesture(GraphInputGesture.PAN, event, this))
+//        {
+//        }
+  }
+
+  private void handlePanningTouchDragged(final TouchEvent event) {
+    if (!Cursor.MOVE.equals(getCursor())) {
+      startPanning(event.getTouchPoint().getScreenX(), event.getTouchPoint().getScreenY());
+    }
+
+    final double deltaX = event.getTouchPoint().getScreenX() - clickPosition.getX();
+    final double deltaY = event.getTouchPoint().getScreenY() - clickPosition.getY();
+
+    final double newWindowX = windowPosAtClick.getX() - deltaX;
+    final double newWindowY = windowPosAtClick.getY() - deltaY;
+
+    panTo(newWindowX, newWindowY);
+//        if (properties != null && properties.activateGesture(GraphInputGesture.PAN, event, this)) {
+//
+//        }
+  }
+
+  private void handleScroll(final ScrollEvent pEvent) {
+    // this intended for mouse-scroll events (event direct == false)
+    // the event also gets synthesized from touch events, which we want to ignore as they are handled in handleZoom()
+//        if (pEvent.isDirect() || pEvent.getTouchCount() > 0 || properties == null) {
+//            return;
+//        }
+//
+//        if (properties.activateGesture(GraphInputGesture.ZOOM, pEvent, this)) {
+//            try {
+//                final double modifier = pEvent.getDeltaY() > 1 ? 0.06 : -0.06;
+//                setZoomAt(getZoom() + modifier, pEvent.getX(), pEvent.getY());
+//                pEvent.consume();
+//            } finally {
+//                properties.finishGesture(GraphInputGesture.ZOOM, this);
+//            }
+//        } else if (properties.activateGesture(GraphInputGesture.PAN, pEvent, this)) {
+//            try {
+//                panTo(getContentX() - pEvent.getDeltaX(), getContentY() - pEvent.getDeltaY());
+//                pEvent.consume();
+//            } finally {
+//                properties.finishGesture(GraphInputGesture.PAN, this);
+//            }
+//        }
+  }
+
+  private void handleZoom(final ZoomEvent pEvent) {
+//        if (properties == null) {
+//            return;
+//        }
+//
+//        if (pEvent.getEventType() == ZoomEvent.ZOOM_STARTED && properties.activateGesture(GraphInputGesture.ZOOM, pEvent, this)) {
+//            pEvent.consume();
+//        } else if (pEvent.getEventType() == ZoomEvent.ZOOM_FINISHED && properties.finishGesture(GraphInputGesture.ZOOM, this)) {
+//            pEvent.consume();
+//        } else if (pEvent.getEventType() == ZoomEvent.ZOOM && properties.activateGesture(GraphInputGesture.ZOOM, pEvent, this)) {
+//            final double newZoomLevel = getZoom() * pEvent.getZoomFactor();
+//            setZoomAt(newZoomLevel, pEvent.getX(), pEvent.getY());
+//            pEvent.consume();
+//        }
+  }
+
+  private void addMouseHandlersToContent(final Node pContent) {
+    pContent.addEventHandler(MouseEvent.MOUSE_PRESSED, mousePressedHandler);
+    pContent.addEventHandler(MouseEvent.MOUSE_DRAGGED, mouseDraggedHandler);
+
+    pContent.addEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedHandler);
+    // sometimes MOUSE_RELEASED is not delivered but the MOUSE_CLICKED..
+    pContent.addEventHandler(MouseEvent.MOUSE_CLICKED, mouseReleasedHandler);
+
+    pContent.addEventHandler(TouchEvent.TOUCH_PRESSED, touchPressedHandler);
+    pContent.addEventHandler(TouchEvent.TOUCH_MOVED, touchDraggedHandler);
+    pContent.addEventHandler(TouchEvent.TOUCH_RELEASED, touchReleasedHandler);
+
+    pContent.addEventHandler(ZoomEvent.ANY, zoomHandler);
+    pContent.addEventHandler(ScrollEvent.SCROLL, scrollHandler);
+  }
+
+  private void removeMouseHandlersFromContent(final @NotNull Node pContent) {
+    pContent.removeEventHandler(MouseEvent.MOUSE_PRESSED, mousePressedHandler);
+    pContent.removeEventHandler(MouseEvent.MOUSE_DRAGGED, mouseDraggedHandler);
+
+    pContent.removeEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedHandler);
+    // sometimes MOUSE_RELEASED is not delivered but the MOUSE_CLICKED..
+    pContent.removeEventHandler(MouseEvent.MOUSE_CLICKED, mouseReleasedHandler);
+
+    pContent.removeEventHandler(TouchEvent.TOUCH_PRESSED, touchPressedHandler);
+    pContent.removeEventHandler(TouchEvent.TOUCH_MOVED, touchDraggedHandler);
+    pContent.removeEventHandler(TouchEvent.TOUCH_RELEASED, touchReleasedHandler);
+
+    pContent.removeEventHandler(ZoomEvent.ANY, zoomHandler);
+    pContent.removeEventHandler(ScrollEvent.SCROLL, scrollHandler);
+  }
+
+  private void startPanning(final double x, final double y) {
+    setCursor(Cursor.MOVE);
+
+    clickPosition = new Point2D(x, y);
+    windowPosAtClick = new Point2D(getContentX(), getContentY());
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/view/SelectionBox.java b/visual-editor/src/main/java/org/visual/editor/view/SelectionBox.java
new file mode 100644
index 0000000..ba04820
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/view/SelectionBox.java
@@ -0,0 +1,88 @@
+package org.visual.editor.view;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.scene.Scene;
+import javafx.scene.shape.Rectangle;
+import javafx.stage.Window;
+import lombok.val;
+import org.jetbrains.annotations.NotNull;
+import org.visual.data.structure.graph.GraphicalObject;
+
+
+/**
+ * The rectangle that is drawn when dragging on the view to create a selection.
+ */
+public class SelectionBox extends Rectangle {
+
+  private static final String STYLE_CLASS_SELECTION_BOX = "graph-editor-selection-box";
+
+  private ChangeListener<Window> windowListener;
+  private ChangeListener<Boolean> windowFocusListener;
+
+  /**
+   * Creates a new {@link SelectionBox} instance.
+   */
+  public SelectionBox() {
+    getStyleClass().addAll(STYLE_CLASS_SELECTION_BOX);
+
+    setVisible(false);
+    setManaged(false);
+    setMouseTransparent(true);
+
+    addWindowFocusListener();
+  }
+
+  public void draw(
+    @NotNull GraphicalObject graphicalObject
+  ) {
+    setVisible(true);
+    setX(graphicalObject.getX());
+    setY(graphicalObject.getY());
+    setWidth(graphicalObject.getWidth());
+    setHeight(graphicalObject.getHeight());
+  }
+
+  /**
+   * Adds a listener to the focused property of the selection box's window, so
+   * that the selection box always disappears when the window loses focus.
+   *
+   * <p>
+   * If this listener is not added, the selection box will not disappear if
+   * the user alt-tabs before releasing the right-mouse button.
+   * </p>
+   */
+  private void addWindowFocusListener() {
+    val sceneListener = new ChangeListener<Scene>() {
+      @Override
+      public void changed(ObservableValue<? extends Scene> observable, Scene oldValue, Scene newValue) {
+        if (oldValue != null) {
+          oldValue.windowProperty().removeListener(windowListener);
+        }
+
+        if (newValue != null) {
+          newValue.windowProperty().addListener(windowListener);
+        }
+      }
+    };
+    windowListener = (observable, oldValue, newValue) ->
+    {
+      if (oldValue != null) {
+        oldValue.focusedProperty().removeListener(windowFocusListener);
+      }
+
+      if (newValue != null) {
+        newValue.focusedProperty().addListener(windowFocusListener);
+      }
+    };
+
+    windowFocusListener = (observable, oldValue, newValue) ->
+    {
+      if (!newValue) {
+        setVisible(false);
+      }
+    };
+
+    sceneProperty().addListener(sceneListener);
+  }
+}
diff --git a/visual-editor/src/main/java/org/visual/editor/view/model/EditorProperties.java b/visual-editor/src/main/java/org/visual/editor/view/model/EditorProperties.java
new file mode 100644
index 0000000..efb1705
--- /dev/null
+++ b/visual-editor/src/main/java/org/visual/editor/view/model/EditorProperties.java
@@ -0,0 +1,61 @@
+package org.visual.editor.view.model;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableMap;
+import lombok.Getter;
+import org.visual.editor.constant.EditorElement;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+@Getter
+public class EditorProperties {
+
+  private final Double maxWidth = Double.MAX_VALUE;
+  private final Double maxHeight = Double.MAX_VALUE;
+
+  private final DoubleProperty northBoundValue = new SimpleDoubleProperty(15);
+
+  public double getNorthBoundValue() {
+    return northBoundValue.get();
+  }
+
+  public void setNorthBoundValue(Double newVal) {
+    northBoundValue.set(newVal);
+  }
+
+  private final DoubleProperty southBoundValue = new SimpleDoubleProperty(15);
+
+  public double getSouthBoundValue() {
+    return southBoundValue.get();
+  }
+
+  public void setSouthBoundValue(Double newVal) {
+    southBoundValue.set(newVal);
+  }
+
+  private final DoubleProperty eastBoundValue = new SimpleDoubleProperty(12);
+
+  private final DoubleProperty westBoundValue = new SimpleDoubleProperty(12);
+
+  private final BooleanProperty gridVisibleProperty = new SimpleBooleanProperty(this, "gridVisible");
+
+  public Boolean getGridVisible() {
+    return gridVisibleProperty.get();
+  }
+
+  public void setGridVisible(Boolean newVal) {
+    gridVisibleProperty.set(newVal);
+  }
+
+  private final BooleanProperty snapToGrid = new SimpleBooleanProperty(this, "snapToGrid");
+  private final DoubleProperty gridSpacingProperty = new SimpleDoubleProperty(this, "gridSpacing", 12);
+
+  private final Map<EditorElement, BooleanProperty> readOnly = new EnumMap<>(EditorElement.class);
+  private final ObservableMap<String, String> customProperties = FXCollections.observableHashMap();
+
+}