diff --git a/src/main/java/org/gecko/model/Variable.java b/src/main/java/org/gecko/model/Variable.java
index 6660a43f..abed6fce 100644
--- a/src/main/java/org/gecko/model/Variable.java
+++ b/src/main/java/org/gecko/model/Variable.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Set;
+import java.util.List;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
@@ -22,9 +22,9 @@ public class Variable extends Element implements Renamable {
     private Visibility visibility;
     private boolean hasIncomingConnection;
 
-    private static final Set<String> BUILTIN_TYPES =
-        java.util.Set.of("int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16", "uint32", "uint64",
-            "float", "double", "short", "long", "bool");
+    public static final List<String> BUILTIN_TYPES =
+        List.of("int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16", "uint32", "uint64", "float",
+            "double", "short", "long", "bool");
 
     @JsonCreator
     public Variable(
@@ -52,7 +52,7 @@ public void setType(@NonNull String type) throws ModelException {
     }
 
     @JsonIgnore
-    public static Set<String> getBuiltinTypes() {
+    public static List<String> getBuiltinTypes() {
         return BUILTIN_TYPES;
     }
 
diff --git a/src/main/java/org/gecko/tools/CursorTool.java b/src/main/java/org/gecko/tools/CursorTool.java
index 4c821da4..1644e78d 100644
--- a/src/main/java/org/gecko/tools/CursorTool.java
+++ b/src/main/java/org/gecko/tools/CursorTool.java
@@ -34,6 +34,8 @@
  */
 public class CursorTool extends Tool {
 
+    private static final double DRAG_THRESHOLD = 4;
+
     private boolean isDragging = false;
     private final SelectionManager selectionManager;
     private final EditorViewModel editorViewModel;
@@ -219,10 +221,20 @@ private void setDragAndSelectHandlers(ViewElement<?> element) {
                 return;
             }
             startDraggingElementHandler(event, element.drawElement());
-            selectElement(element, !event.isShiftDown());
+
+            if (!element.isSelected()) {
+                selectElement(element, !event.isShiftDown());
+            }
         });
         element.drawElement().setOnMouseDragged(this::dragElementsHandler);
-        element.drawElement().setOnMouseReleased(this::stopDraggingElementHandler);
+        element.drawElement().setOnMouseReleased(event -> {
+            stopDraggingElementHandler(event);
+
+            if (event.getButton() == MouseButton.PRIMARY && element.isSelected()
+                && startDragPosition.distance(previousDragPosition) * editorViewModel.getZoomScale() < DRAG_THRESHOLD) {
+                selectElement(element, !event.isShiftDown());
+            }
+        });
     }
 
     private void startDraggingElementHandler(MouseEvent event, Node element) {
@@ -295,7 +307,6 @@ private void cancelDrag(ElementScalerBlock scaler) {
     }
 
     private void cancelDrag() {
-        startDragPosition = null;
         draggedElement = null;
         isDragging = false;
     }
diff --git a/src/main/java/org/gecko/tools/RegionCreatorTool.java b/src/main/java/org/gecko/tools/RegionCreatorTool.java
index 643aac18..5d53af3d 100644
--- a/src/main/java/org/gecko/tools/RegionCreatorTool.java
+++ b/src/main/java/org/gecko/tools/RegionCreatorTool.java
@@ -7,7 +7,6 @@
 import javafx.scene.shape.Rectangle;
 import org.gecko.actions.ActionManager;
 import org.gecko.viewmodel.BlockViewModelElement;
-import org.gecko.viewmodel.PositionableViewModelElement;
 
 /**
  * A concrete representation of a region-creating-{@link AreaTool}, utilized for creating a
diff --git a/src/main/java/org/gecko/view/GeckoView.java b/src/main/java/org/gecko/view/GeckoView.java
index 6b12138d..b2299fb0 100644
--- a/src/main/java/org/gecko/view/GeckoView.java
+++ b/src/main/java/org/gecko/view/GeckoView.java
@@ -30,7 +30,6 @@ public class GeckoView {
     private static final String STYLE_SHEET_LIGHT = "/styles/gecko.css";
     private static final String STYLE_SHEET_DARK = "/styles/gecko-dark.css";
 
-
     @Getter
     private final BorderPane mainPane;
     private final TabPane centerPane;
diff --git a/src/main/java/org/gecko/view/ResourceHandler.java b/src/main/java/org/gecko/view/ResourceHandler.java
index ca2c7df9..cf59192f 100644
--- a/src/main/java/org/gecko/view/ResourceHandler.java
+++ b/src/main/java/org/gecko/view/ResourceHandler.java
@@ -15,6 +15,11 @@ public class ResourceHandler {
     @Setter
     private static Locale currentLocale = Locale.getDefault();
 
+    private static final String BUNDLE_PATH = "lang/";
+
+    private ResourceHandler() {
+    }
+
     /**
      * Returns the localized string for the given key from the given bundle.
      *
@@ -27,12 +32,11 @@ public static String getString(String bundle, String key) {
     }
 
     private static ResourceBundle getBundle(String bundleName) {
-        String bundlePath = "lang/";
         ResourceBundle bundle;
         try {
-            bundle = ResourceBundle.getBundle(bundlePath + bundleName, currentLocale);
+            bundle = ResourceBundle.getBundle(BUNDLE_PATH + bundleName, currentLocale);
         } catch (MissingResourceException e) {
-            bundle = ResourceBundle.getBundle(bundlePath + bundleName, Locale.US);
+            bundle = ResourceBundle.getBundle(BUNDLE_PATH + bundleName, Locale.US);
         }
         return bundle;
     }
diff --git a/src/main/java/org/gecko/view/inspector/Inspector.java b/src/main/java/org/gecko/view/inspector/Inspector.java
index bfdd22ca..70a8b39d 100644
--- a/src/main/java/org/gecko/view/inspector/Inspector.java
+++ b/src/main/java/org/gecko/view/inspector/Inspector.java
@@ -41,7 +41,6 @@ public Inspector(
         inspectorDecorations.getChildren().addAll(selectionButtons);
 
         vBox.getChildren().add(inspectorDecorations);
-        setFitToHeight(true);
 
         for (InspectorElement<?> element : elements) {
             vBox.getChildren().add(element.getControl());
diff --git a/src/main/java/org/gecko/view/inspector/builder/AutomatonVariablePaneBuilder.java b/src/main/java/org/gecko/view/inspector/builder/AutomatonVariablePaneBuilder.java
index 80e68222..e6aaebb2 100644
--- a/src/main/java/org/gecko/view/inspector/builder/AutomatonVariablePaneBuilder.java
+++ b/src/main/java/org/gecko/view/inspector/builder/AutomatonVariablePaneBuilder.java
@@ -1,10 +1,14 @@
 package org.gecko.view.inspector.builder;
 
 import javafx.geometry.Insets;
+import javafx.scene.control.ListView;
 import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import org.gecko.actions.ActionManager;
 import org.gecko.model.Visibility;
+import org.gecko.view.inspector.element.InspectorElement;
+import org.gecko.view.inspector.element.container.InspectorVariableField;
 import org.gecko.view.inspector.element.container.InspectorVariableLabel;
 import org.gecko.view.inspector.element.list.InspectorVariableList;
 import org.gecko.viewmodel.SystemViewModel;
@@ -12,7 +16,6 @@
 public class AutomatonVariablePaneBuilder {
 
     private static final int VARIABLE_PANE_WIDTH = 320;
-    private static final int LIST_HEIGHT = 100;
     private static final int ELEMENT_SPACING = 10;
 
     private final ScrollPane scrollPane;
@@ -22,14 +25,14 @@ public AutomatonVariablePaneBuilder(ActionManager actionManager, SystemViewModel
         scrollPane.setPrefWidth(VARIABLE_PANE_WIDTH);
 
         VBox content = new VBox();
-        InspectorVariableLabel inputLabel =
+        InspectorElement<HBox> inputLabel =
             new InspectorVariableLabel(actionManager, systemViewModel, Visibility.INPUT);
-        InspectorVariableList inputList = new InspectorVariableList(actionManager, systemViewModel, Visibility.INPUT);
-        InspectorVariableLabel outputLabel =
+        InspectorElement<ListView<InspectorVariableField>> inputList =
+            new InspectorVariableList(actionManager, systemViewModel, Visibility.INPUT);
+        InspectorElement<HBox> outputLabel =
             new InspectorVariableLabel(actionManager, systemViewModel, Visibility.OUTPUT);
-        InspectorVariableList outputList = new InspectorVariableList(actionManager, systemViewModel, Visibility.OUTPUT);
-        inputList.getControl().setPrefHeight(LIST_HEIGHT);
-        outputList.getControl().setPrefHeight(LIST_HEIGHT);
+        InspectorElement<ListView<InspectorVariableField>> outputList =
+            new InspectorVariableList(actionManager, systemViewModel, Visibility.OUTPUT);
 
         content.getChildren()
             .addAll(inputLabel.getControl(), inputList.getControl(), outputLabel.getControl(), outputList.getControl());
diff --git a/src/main/java/org/gecko/view/inspector/element/button/InspectorAddContractButton.java b/src/main/java/org/gecko/view/inspector/element/button/InspectorAddContractButton.java
index c0d5ab54..04639148 100644
--- a/src/main/java/org/gecko/view/inspector/element/button/InspectorAddContractButton.java
+++ b/src/main/java/org/gecko/view/inspector/element/button/InspectorAddContractButton.java
@@ -9,9 +9,11 @@
  * {@link org.gecko.viewmodel.ContractViewModel ContractViewModel} to a given {@link StateViewModel}.
  */
 public class InspectorAddContractButton extends AbstractInspectorButton {
+    private static final String STYLE = "inspector-add-button";
     private static final int WIDTH = 70;
 
     public InspectorAddContractButton(ActionManager actionManager, StateViewModel stateViewModel) {
+        getStyleClass().add(STYLE);
         setText(ResourceHandler.getString("Buttons", "inspector_add_contract"));
         setPrefWidth(WIDTH);
         setOnAction(event -> {
diff --git a/src/main/java/org/gecko/view/inspector/element/button/InspectorAddVariableButton.java b/src/main/java/org/gecko/view/inspector/element/button/InspectorAddVariableButton.java
index 946bd71b..6760ecf8 100644
--- a/src/main/java/org/gecko/view/inspector/element/button/InspectorAddVariableButton.java
+++ b/src/main/java/org/gecko/view/inspector/element/button/InspectorAddVariableButton.java
@@ -11,11 +11,12 @@
  * {@link SystemViewModel} with a given {@link Visibility}.
  */
 public class InspectorAddVariableButton extends AbstractInspectorButton {
-
+    private static final String STYLE = "inspector-add-button";
     private static final int WIDTH = 70;
 
     public InspectorAddVariableButton(
         ActionManager actionManager, SystemViewModel systemViewModel, Visibility visibility) {
+        getStyleClass().add(STYLE);
         setText(ResourceHandler.getString("Buttons", "inspector_add_variable"));
         setPrefWidth(WIDTH);
         setOnAction(event -> {
diff --git a/src/main/java/org/gecko/view/inspector/element/button/InspectorOpenSystemButton.java b/src/main/java/org/gecko/view/inspector/element/button/InspectorOpenSystemButton.java
index c1b83b8a..5b898636 100644
--- a/src/main/java/org/gecko/view/inspector/element/button/InspectorOpenSystemButton.java
+++ b/src/main/java/org/gecko/view/inspector/element/button/InspectorOpenSystemButton.java
@@ -11,10 +11,11 @@
  * system view corresponding to the given system.
  */
 public class InspectorOpenSystemButton extends AbstractInspectorButton {
-
+    private static final String STYLE = "inspector-open-system-button";
     private static final int WIDTH = 300;
 
     public InspectorOpenSystemButton(ActionManager actionManager, SystemViewModel systemViewModel) {
+        getStyleClass().add(STYLE);
         setText(ResourceHandler.getString("Buttons", "inspector_open_system"));
         setPrefWidth(WIDTH);
         setOnAction(event -> actionManager.run(
diff --git a/src/main/java/org/gecko/view/inspector/element/button/InspectorSetStartStateButton.java b/src/main/java/org/gecko/view/inspector/element/button/InspectorSetStartStateButton.java
index e4b57ae7..762e793e 100644
--- a/src/main/java/org/gecko/view/inspector/element/button/InspectorSetStartStateButton.java
+++ b/src/main/java/org/gecko/view/inspector/element/button/InspectorSetStartStateButton.java
@@ -10,7 +10,10 @@
  * Represents a type of {@link AbstractInspectorButton} used for setting a {@link StateViewModel} as start-state.
  */
 public class InspectorSetStartStateButton extends ToggleButton implements InspectorElement<ToggleButton> {
+    private static final String START_STATE_STYLE = "inspector-start-state-button";
+
     public InspectorSetStartStateButton(ActionManager actionManager, StateViewModel stateViewModel) {
+        getStyleClass().add(START_STATE_STYLE);
         setMaxWidth(Double.MAX_VALUE);
         setText(ResourceHandler.getString("Buttons", "inspector_set_start_state"));
         update(stateViewModel.getIsStartState());
diff --git a/src/main/java/org/gecko/view/inspector/element/combobox/InspectorTypeComboBox.java b/src/main/java/org/gecko/view/inspector/element/combobox/InspectorTypeComboBox.java
new file mode 100644
index 00000000..7ec61023
--- /dev/null
+++ b/src/main/java/org/gecko/view/inspector/element/combobox/InspectorTypeComboBox.java
@@ -0,0 +1,26 @@
+package org.gecko.view.inspector.element.combobox;
+
+import org.gecko.actions.Action;
+import org.gecko.actions.ActionManager;
+import org.gecko.model.Variable;
+import org.gecko.viewmodel.PortViewModel;
+
+/**
+ * A concrete representation of an {@link InspectorComboBox} for a {@link PortViewModel}, through which the type of the
+ * port can be changed.
+ */
+public class InspectorTypeComboBox extends InspectorComboBox<String> {
+    private final PortViewModel viewModel;
+    private final ActionManager actionManager;
+
+    public InspectorTypeComboBox(ActionManager actionManager, PortViewModel viewModel) {
+        super(actionManager, Variable.BUILTIN_TYPES, viewModel.getTypeProperty());
+        this.viewModel = viewModel;
+        this.actionManager = actionManager;
+    }
+
+    @Override
+    protected Action getAction() {
+        return actionManager.getActionFactory().createChangeTypePortViewModelElementAction(viewModel, getValue());
+    }
+}
diff --git a/src/main/java/org/gecko/view/inspector/element/container/InspectorCodeSystemContainer.java b/src/main/java/org/gecko/view/inspector/element/container/InspectorCodeSystemContainer.java
index dbf98f3a..895e8a35 100644
--- a/src/main/java/org/gecko/view/inspector/element/container/InspectorCodeSystemContainer.java
+++ b/src/main/java/org/gecko/view/inspector/element/container/InspectorCodeSystemContainer.java
@@ -11,10 +11,13 @@
 public class InspectorCodeSystemContainer extends VBox implements InspectorElement<VBox> {
 
     public InspectorCodeSystemContainer(ActionManager actionManager, SystemViewModel viewModel) {
+        if (!viewModel.getTarget().getChildren().isEmpty()) {
+            return;
+        }
+
         getChildren().add(new InspectorLabel("Code"));
         InspectorAreaField codeField = new InspectorCodeSystemField(actionManager, viewModel);
         codeField.prefWidthProperty().bind(widthProperty().subtract(50));
-        codeField.setPrefHeight(100);
         getChildren().add(codeField);
     }
 
diff --git a/src/main/java/org/gecko/view/inspector/element/container/InspectorTypeLabel.java b/src/main/java/org/gecko/view/inspector/element/container/InspectorTypeLabel.java
index 4a1b3713..aac89f10 100644
--- a/src/main/java/org/gecko/view/inspector/element/container/InspectorTypeLabel.java
+++ b/src/main/java/org/gecko/view/inspector/element/container/InspectorTypeLabel.java
@@ -2,18 +2,18 @@
 
 import org.gecko.actions.ActionManager;
 import org.gecko.view.ResourceHandler;
+import org.gecko.view.inspector.element.combobox.InspectorTypeComboBox;
 import org.gecko.view.inspector.element.label.InspectorLabel;
-import org.gecko.view.inspector.element.textfield.InspectorTypeField;
 import org.gecko.viewmodel.PortViewModel;
 
 /**
  * Represents a type of {@link LabeledInspectorElement}. Contains an {@link InspectorLabel} and an
- * {@link InspectorTypeField}.
+ * {@link InspectorTypeComboBox}.
  */
 public class InspectorTypeLabel extends LabeledInspectorElement {
 
     public InspectorTypeLabel(ActionManager actionManager, PortViewModel viewModel) {
         super(new InspectorLabel(ResourceHandler.getString("Inspector", "type")),
-            new InspectorTypeField(actionManager, viewModel));
+            new InspectorTypeComboBox(actionManager, viewModel));
     }
 }
diff --git a/src/main/java/org/gecko/view/inspector/element/container/InspectorVariableField.java b/src/main/java/org/gecko/view/inspector/element/container/InspectorVariableField.java
index 3a5d9be6..2bf841fd 100644
--- a/src/main/java/org/gecko/view/inspector/element/container/InspectorVariableField.java
+++ b/src/main/java/org/gecko/view/inspector/element/container/InspectorVariableField.java
@@ -8,9 +8,9 @@
 import org.gecko.view.ResourceHandler;
 import org.gecko.view.inspector.element.InspectorElement;
 import org.gecko.view.inspector.element.button.InspectorRemoveVariableButton;
+import org.gecko.view.inspector.element.combobox.InspectorTypeComboBox;
 import org.gecko.view.inspector.element.label.InspectorLabel;
 import org.gecko.view.inspector.element.textfield.InspectorRenameField;
-import org.gecko.view.inspector.element.textfield.InspectorTypeField;
 import org.gecko.viewmodel.PortViewModel;
 
 /**
@@ -32,7 +32,7 @@ public InspectorVariableField(ActionManager actionManager, PortViewModel portVie
         InspectorElement<?> deleteButton = new InspectorRemoveVariableButton(actionManager, portViewModel);
         nameAndDeleteContainer.getChildren().addAll(variableNameField.getControl(), spacer, deleteButton.getControl());
         InspectorElement<?> typeLabel = new InspectorLabel(ResourceHandler.getString("Inspector", "type"));
-        InspectorElement<?> typeField = new InspectorTypeField(actionManager, portViewModel);
+        InspectorElement<?> typeField = new InspectorTypeComboBox(actionManager, portViewModel);
         HBox typeContainer = new HBox();
         typeContainer.getChildren().addAll(typeLabel.getControl(), typeField.getControl());
         getChildren().addAll(nameAndDeleteContainer, typeContainer);
diff --git a/src/main/java/org/gecko/view/inspector/element/list/InspectorVariableList.java b/src/main/java/org/gecko/view/inspector/element/list/InspectorVariableList.java
index 4c0193ad..9cc9eb6c 100644
--- a/src/main/java/org/gecko/view/inspector/element/list/InspectorVariableList.java
+++ b/src/main/java/org/gecko/view/inspector/element/list/InspectorVariableList.java
@@ -1,5 +1,6 @@
 package org.gecko.view.inspector.element.list;
 
+import javafx.beans.binding.Bindings;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import org.gecko.actions.ActionManager;
@@ -13,6 +14,9 @@
  */
 public class InspectorVariableList extends AbstractInspectorList<InspectorVariableField> {
 
+    private static final double listCellHeight = 43;
+    private static final int MIN_HEIGHT = 60;
+
     private final ActionManager actionManager;
     private final SystemViewModel viewModel;
     private final Visibility visibility;
@@ -21,6 +25,10 @@ public InspectorVariableList(ActionManager actionManager, SystemViewModel viewMo
         this.actionManager = actionManager;
         this.viewModel = viewModel;
         this.visibility = visibility;
+
+        setMinHeight(MIN_HEIGHT);
+        prefHeightProperty().bind(Bindings.size(getItems()).multiply(listCellHeight));
+
         viewModel.getPortsProperty().addListener(this::onPortsListChanged);
         viewModel.getPorts().stream().filter(port -> port.getVisibility() == visibility).forEach(this::addPortItem);
         viewModel.getPorts().forEach(port -> port.getVisibilityProperty().addListener(this::onVisibilityChanged));
diff --git a/src/main/java/org/gecko/view/inspector/element/textfield/InspectorAreaField.java b/src/main/java/org/gecko/view/inspector/element/textfield/InspectorAreaField.java
index ca78a5f6..1f7bbe6f 100644
--- a/src/main/java/org/gecko/view/inspector/element/textfield/InspectorAreaField.java
+++ b/src/main/java/org/gecko/view/inspector/element/textfield/InspectorAreaField.java
@@ -7,7 +7,7 @@
 import org.gecko.view.inspector.element.InspectorElement;
 
 public abstract class InspectorAreaField extends TextArea implements InspectorElement<TextArea> {
-    private static final int MAX_HEIGHT = 30;
+    private static final int MAX_HEIGHT = 40;
     private static final int EXPANDED_MAX_HEIGHT = 90;
 
     protected InspectorAreaField(ActionManager actionManager, StringProperty stringProperty, boolean isEmptyAllowed) {
@@ -16,7 +16,7 @@ protected InspectorAreaField(ActionManager actionManager, StringProperty stringP
         setPrefHeight(MAX_HEIGHT);
         setWrapText(true);
 
-        setOnMouseExited(event -> {
+        focusedProperty().addListener(event -> {
             if ((getText() == null && stringProperty.get() == null) || (getText() != null && getText().equals(
                 stringProperty.get())) || (stringProperty.get() != null && stringProperty.get().equals(getText()))) {
                 return;
diff --git a/src/main/java/org/gecko/view/inspector/element/textfield/InspectorCodeSystemField.java b/src/main/java/org/gecko/view/inspector/element/textfield/InspectorCodeSystemField.java
index 0337d06b..d5a6723f 100644
--- a/src/main/java/org/gecko/view/inspector/element/textfield/InspectorCodeSystemField.java
+++ b/src/main/java/org/gecko/view/inspector/element/textfield/InspectorCodeSystemField.java
@@ -1,10 +1,12 @@
 package org.gecko.view.inspector.element.textfield;
 
+import javafx.beans.binding.Bindings;
 import org.gecko.actions.Action;
 import org.gecko.actions.ActionManager;
 import org.gecko.viewmodel.SystemViewModel;
 
 public class InspectorCodeSystemField extends InspectorAreaField {
+    private static final int HEIGHT_THRESHOLD = 90;
     private final ActionManager actionManager;
     private final SystemViewModel systemViewModel;
 
@@ -12,6 +14,10 @@ public InspectorCodeSystemField(ActionManager actionManager, SystemViewModel sys
         super(actionManager, systemViewModel.getCodeProperty(), true);
         this.actionManager = actionManager;
         this.systemViewModel = systemViewModel;
+
+        prefHeightProperty().bind(
+            Bindings.createDoubleBinding(() -> getFont().getSize() * getParagraphs().size() + HEIGHT_THRESHOLD,
+                fontProperty(), textProperty()));
     }
 
     @Override
diff --git a/src/main/java/org/gecko/view/inspector/element/textfield/InspectorTypeField.java b/src/main/java/org/gecko/view/inspector/element/textfield/InspectorTypeField.java
deleted file mode 100644
index ffc3e1bb..00000000
--- a/src/main/java/org/gecko/view/inspector/element/textfield/InspectorTypeField.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.gecko.view.inspector.element.textfield;
-
-import org.gecko.actions.Action;
-import org.gecko.actions.ActionManager;
-import org.gecko.viewmodel.PortViewModel;
-
-/**
- * A concrete representation of an {@link InspectorTextField} for a {@link PortViewModel}, through which the type of the
- * port can be changed.
- */
-public class InspectorTypeField extends InspectorTextField {
-    private final PortViewModel viewModel;
-    private final ActionManager actionManager;
-
-    public InspectorTypeField(ActionManager actionManager, PortViewModel viewModel) {
-        super(viewModel.getTypeProperty(), actionManager);
-        this.viewModel = viewModel;
-        this.actionManager = actionManager;
-    }
-
-    @Override
-    protected Action getAction() {
-        return actionManager.getActionFactory().createChangeTypePortViewModelElementAction(viewModel, getText());
-    }
-}
diff --git a/src/main/java/org/gecko/view/views/EditorView.java b/src/main/java/org/gecko/view/views/EditorView.java
index db123070..29b956a5 100644
--- a/src/main/java/org/gecko/view/views/EditorView.java
+++ b/src/main/java/org/gecko/view/views/EditorView.java
@@ -164,7 +164,6 @@ public EditorView(
         // Set current tool
         viewModel.getCurrentToolProperty().addListener(this::onToolChanged);
 
-
         // Viewport position listener
         viewModel.getRequestedViewPortPositionProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue == null) {
diff --git a/src/main/java/org/gecko/view/views/viewelement/BlockViewElement.java b/src/main/java/org/gecko/view/views/viewelement/BlockViewElement.java
index f6f12143..284dee9f 100644
--- a/src/main/java/org/gecko/view/views/viewelement/BlockViewElement.java
+++ b/src/main/java/org/gecko/view/views/viewelement/BlockViewElement.java
@@ -7,6 +7,7 @@
 import javafx.geometry.Point2D;
 import javafx.scene.layout.Pane;
 import lombok.Getter;
+import lombok.Setter;
 import org.gecko.model.Element;
 import org.gecko.viewmodel.PositionableViewModelElement;
 
@@ -19,6 +20,10 @@ public abstract class BlockViewElement extends Pane {
     @Getter
     private final ObservableList<Property<Point2D>> edgePoints;
 
+    @Getter
+    @Setter
+    private boolean selected;
+
     protected static final int BACKGROUND_ROUNDING = 15;
 
     protected BlockViewElement(PositionableViewModelElement<? extends Element> positionableViewModelElement) {
diff --git a/src/main/java/org/gecko/view/views/viewelement/ConnectionViewElement.java b/src/main/java/org/gecko/view/views/viewelement/ConnectionViewElement.java
index 58ebf2ae..5efad294 100644
--- a/src/main/java/org/gecko/view/views/viewelement/ConnectionViewElement.java
+++ b/src/main/java/org/gecko/view/views/viewelement/ConnectionViewElement.java
@@ -32,6 +32,10 @@ public abstract class ConnectionViewElement extends Path {
     @Setter
     private boolean isLoop;
 
+    @Getter
+    @Setter
+    private boolean selected;
+
     /**
      * The render path source is a list of pairs of double properties. The first element of the pair is the x property
      * of the point, and the second element is the y property of the point. This list represents the actual points that
diff --git a/src/main/java/org/gecko/view/views/viewelement/StateViewElement.java b/src/main/java/org/gecko/view/views/viewelement/StateViewElement.java
index 649ba73a..56701ab8 100644
--- a/src/main/java/org/gecko/view/views/viewelement/StateViewElement.java
+++ b/src/main/java/org/gecko/view/views/viewelement/StateViewElement.java
@@ -11,6 +11,7 @@
 import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
+import javafx.scene.control.Labeled;
 import javafx.scene.control.Separator;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
@@ -112,7 +113,7 @@ private void constructVisualization() {
         contents.getChildren().add(new Separator());
 
         // Contracts
-        Label contracts = new Label("Contracts: " + stateViewModel.getContractsProperty().size());
+        Labeled contracts = new Label("Contracts: " + stateViewModel.getContractsProperty().size());
         contracts.textProperty()
             .bind(Bindings.createStringBinding(() -> "Contracts: " + stateViewModel.getContractsProperty().size(),
                 stateViewModel.getContractsProperty()));
diff --git a/src/main/java/org/gecko/view/views/viewelement/VariableBlockViewElement.java b/src/main/java/org/gecko/view/views/viewelement/VariableBlockViewElement.java
index bd3eb930..1db74014 100644
--- a/src/main/java/org/gecko/view/views/viewelement/VariableBlockViewElement.java
+++ b/src/main/java/org/gecko/view/views/viewelement/VariableBlockViewElement.java
@@ -92,8 +92,8 @@ private void constructVisualization() {
         rectangle.heightProperty().bind(heightProperty());
         rectangle.fillProperty().bind(Bindings.createObjectBinding(() -> switch (visibilityProperty.getValue()) {
             case INPUT -> Color.LIGHTGREEN;
-            case OUTPUT -> Color.LIGHTCORAL;
-            case STATE -> Color.LIGHTSKYBLUE;
+            case OUTPUT -> Color.LIGHTGOLDENRODYELLOW;
+            case STATE -> Color.LIGHTSEAGREEN;
         }, visibilityProperty));
         rectangle.setArcWidth(BACKGROUND_ROUNDING);
         rectangle.setArcHeight(BACKGROUND_ROUNDING);
diff --git a/src/main/java/org/gecko/view/views/viewelement/ViewElement.java b/src/main/java/org/gecko/view/views/viewelement/ViewElement.java
index 8a00a559..246b7146 100644
--- a/src/main/java/org/gecko/view/views/viewelement/ViewElement.java
+++ b/src/main/java/org/gecko/view/views/viewelement/ViewElement.java
@@ -49,8 +49,14 @@ default boolean setEdgePoint(int index, Point2D point) {
      *
      * @param selected the selected state
      */
-    default void setSelected(boolean selected) {
-    }
+    void setSelected(boolean selected);
+
+    /**
+     * Get the selected state of the element.
+     *
+     * @return the selected state
+     */
+    boolean isSelected();
 
     /**
      * Get the target view model of the element.
diff --git a/src/main/java/org/gecko/viewmodel/RegionViewModel.java b/src/main/java/org/gecko/viewmodel/RegionViewModel.java
index 32e23cb2..98b7ce22 100644
--- a/src/main/java/org/gecko/viewmodel/RegionViewModel.java
+++ b/src/main/java/org/gecko/viewmodel/RegionViewModel.java
@@ -10,7 +10,6 @@
 import javafx.collections.ObservableList;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.paint.Color;
 import lombok.Getter;
 import lombok.NonNull;
diff --git a/src/main/resources/styles/gecko-base.css b/src/main/resources/styles/gecko-base.css
index ffb7dff5..7f54e77d 100644
--- a/src/main/resources/styles/gecko-base.css
+++ b/src/main/resources/styles/gecko-base.css
@@ -166,7 +166,6 @@
 }
 
 .text-field {
-    -fx-background-color: -fx-fg0;
     -fx-background-radius: 5;
     -fx-border-radius: 5;
     -fx-border-color: -fx-text;
@@ -350,7 +349,7 @@
 }
 
 .combo-box .arrow, .combo-box .arrow-button {
-    -fx-background-color: -fx-fg0;
+    -fx-background-color: -fx-fg2;
     -fx-background-radius: 2;
     -fx-border-radius: 0;
     -fx-border-color: -fx-text;
@@ -377,6 +376,39 @@
     -fx-background-color: -fx-highlight;
 }
 
+.inspector-delete-button:hover {
+    -fx-background-color: -fx-highlight-hover;
+}
+
+/* remove-button is used for variable/contract */
+.inspector-remove-button {
+    -fx-background-color: -fx-highlight;
+}
+
+.inspector-remove-button:hover {
+    -fx-background-color: -fx-highlight-hover;
+}
+
+.inspector-start-state-button {
+    -fx-background-color: -fx-green;
+}
+
+.inspector-open-system-button {
+    -fx-background-color: -fx-highlight2;
+}
+
+.inspector-open-system-button:hover {
+    -fx-background-color: -fx-highlight2-hover;
+}
+
+.inspector-add-button {
+    -fx-background-color: -fx-highlight3;
+}
+
+.inspector-add-button:hover {
+    -fx-background-color: -fx-highlight3-hover;
+}
+
 .state-view-element-start {
     -fx-background-color: -fx-green;
     -fx-background-radius: 5;
diff --git a/src/main/resources/styles/gecko-dark.css b/src/main/resources/styles/gecko-dark.css
index 24945b08..74dba9aa 100644
--- a/src/main/resources/styles/gecko-dark.css
+++ b/src/main/resources/styles/gecko-dark.css
@@ -7,6 +7,11 @@
     -fx-fg2: #878787;
     -fx-text: #e6e6e6;
     -fx-highlight: #8b0000;
+    -fx-highlight: #6b0000;
+    -fx-highlight2: #41c2d3;
+    -fx-highlight2-hover: #4179d3;
+    -fx-highlight3: #96e876;
+    -fx-highlight3-hover: #76e88e;
     -fx-green: #3a5311;
 }
 
diff --git a/src/main/resources/styles/gecko.css b/src/main/resources/styles/gecko.css
index b4647020..f3b57381 100644
--- a/src/main/resources/styles/gecko.css
+++ b/src/main/resources/styles/gecko.css
@@ -7,6 +7,11 @@
     -fx-fg2: #bababa;
     -fx-text: #222222;
     -fx-highlight: #ee4700;
+    -fx-highlight-hover: #ee2700;
+    -fx-highlight2: #41c2d3;
+    -fx-highlight2-hover: #4179d3;
+    -fx-highlight3: #96e876;
+    -fx-highlight3-hover: #76e88e;
     -fx-green: #5dbb63;
 }
 
diff --git a/src/test/java/org/gecko/actions/ActionManagerTest.java b/src/test/java/org/gecko/actions/ActionManagerTest.java
index 6abe050a..e277434f 100644
--- a/src/test/java/org/gecko/actions/ActionManagerTest.java
+++ b/src/test/java/org/gecko/actions/ActionManagerTest.java
@@ -1,10 +1,8 @@
 package org.gecko.actions;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import javafx.geometry.Point2D;
-import org.gecko.exceptions.GeckoException;
 import org.gecko.exceptions.ModelException;
 import org.gecko.util.TestHelper;
 import org.gecko.viewmodel.GeckoViewModel;
diff --git a/src/test/java/org/gecko/actions/ChangeCodeSystemViewModelElementActionTest.java b/src/test/java/org/gecko/actions/ChangeCodeSystemViewModelElementActionTest.java
index 21f0d6f6..8c2d4cf1 100644
--- a/src/test/java/org/gecko/actions/ChangeCodeSystemViewModelElementActionTest.java
+++ b/src/test/java/org/gecko/actions/ChangeCodeSystemViewModelElementActionTest.java
@@ -6,7 +6,6 @@
 import org.gecko.exceptions.ModelException;
 import org.gecko.util.TestHelper;
 import org.gecko.viewmodel.GeckoViewModel;
-import org.gecko.viewmodel.StateViewModel;
 import org.gecko.viewmodel.SystemViewModel;
 import org.gecko.viewmodel.ViewModelFactory;
 import org.junit.jupiter.api.BeforeAll;
@@ -23,19 +22,16 @@ static void setUp() throws ModelException {
         actionManager = new ActionManager(geckoViewModel);
         actionFactory = new ActionFactory(geckoViewModel);
         ViewModelFactory viewModelFactory = geckoViewModel.getViewModelFactory();
-        systemViewModel =
-            viewModelFactory.createSystemViewModelFrom(geckoViewModel.getGeckoModel().getRoot());
+        systemViewModel = viewModelFactory.createSystemViewModelFrom(geckoViewModel.getGeckoModel().getRoot());
     }
 
     @Test
     void run() {
-        Action changeCodeAction =
-            actionFactory.createChangeCodeSystemViewModelAction(systemViewModel, "newCode");
+        Action changeCodeAction = actionFactory.createChangeCodeSystemViewModelAction(systemViewModel, "newCode");
         actionManager.run(changeCodeAction);
         assertEquals("newCode", systemViewModel.getCode());
 
-        Action changeCodeAction2 =
-            actionFactory.createChangeCodeSystemViewModelAction(systemViewModel, "");
+        Action changeCodeAction2 = actionFactory.createChangeCodeSystemViewModelAction(systemViewModel, "");
         actionManager.run(changeCodeAction2);
         assertNull(systemViewModel.getCode());
     }
diff --git a/src/test/java/org/gecko/actions/ChangePriorityEdgeViewModelActionTest.java b/src/test/java/org/gecko/actions/ChangePriorityEdgeViewModelActionTest.java
index d734d615..2648cd31 100644
--- a/src/test/java/org/gecko/actions/ChangePriorityEdgeViewModelActionTest.java
+++ b/src/test/java/org/gecko/actions/ChangePriorityEdgeViewModelActionTest.java
@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.gecko.exceptions.ModelException;
-import org.gecko.model.Kind;
 import org.gecko.util.TestHelper;
 import org.gecko.viewmodel.EdgeViewModel;
 import org.gecko.viewmodel.GeckoViewModel;
diff --git a/src/test/java/org/gecko/actions/DeletePositionableViewModelElementActionTest.java b/src/test/java/org/gecko/actions/DeletePositionableViewModelElementActionTest.java
index 07768640..e6227f10 100644
--- a/src/test/java/org/gecko/actions/DeletePositionableViewModelElementActionTest.java
+++ b/src/test/java/org/gecko/actions/DeletePositionableViewModelElementActionTest.java
@@ -20,6 +20,7 @@
 
 public class DeletePositionableViewModelElementActionTest {
     private Set<PositionableViewModelElement<?>> elements;
+    private StateViewModel stateViewModel1;
     private ActionManager actionManager;
     private ActionFactory actionFactory;
     private GeckoViewModel geckoViewModel;
@@ -33,7 +34,7 @@ void setUp() throws ModelException {
         ViewModelFactory viewModelFactory = geckoViewModel.getViewModelFactory();
         rootSystemViewModel = viewModelFactory.createSystemViewModelFrom(geckoViewModel.getGeckoModel().getRoot());
 
-        StateViewModel stateViewModel1 = viewModelFactory.createStateViewModelIn(rootSystemViewModel);
+        stateViewModel1 = viewModelFactory.createStateViewModelIn(rootSystemViewModel);
         StateViewModel stateViewModel2 = viewModelFactory.createStateViewModelIn(rootSystemViewModel);
         EdgeViewModel edge =
             viewModelFactory.createEdgeViewModelIn(rootSystemViewModel, stateViewModel1, stateViewModel2);
diff --git a/src/test/java/org/gecko/actions/RenameViewModelElementActionTest.java b/src/test/java/org/gecko/actions/RenameViewModelElementActionTest.java
index 486f25c4..42917a9c 100644
--- a/src/test/java/org/gecko/actions/RenameViewModelElementActionTest.java
+++ b/src/test/java/org/gecko/actions/RenameViewModelElementActionTest.java
@@ -2,7 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import javafx.geometry.Point2D;
 import org.gecko.exceptions.ModelException;
 import org.gecko.util.TestHelper;
 import org.gecko.viewmodel.GeckoViewModel;
diff --git a/src/test/java/org/gecko/actions/SelectToolActionTest.java b/src/test/java/org/gecko/actions/SelectToolActionTest.java
index b35065ed..e0e2cc0e 100644
--- a/src/test/java/org/gecko/actions/SelectToolActionTest.java
+++ b/src/test/java/org/gecko/actions/SelectToolActionTest.java
@@ -1,8 +1,6 @@
 package org.gecko.actions;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.gecko.exceptions.ModelException;
 import org.gecko.tools.ToolType;
diff --git a/src/test/java/org/gecko/actions/ViewSwitchActionTest.java b/src/test/java/org/gecko/actions/ViewSwitchActionTest.java
index fc1df355..b0de906d 100644
--- a/src/test/java/org/gecko/actions/ViewSwitchActionTest.java
+++ b/src/test/java/org/gecko/actions/ViewSwitchActionTest.java
@@ -5,10 +5,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.gecko.exceptions.ModelException;
-import org.gecko.model.Visibility;
 import org.gecko.util.TestHelper;
 import org.gecko.viewmodel.GeckoViewModel;
-import org.gecko.viewmodel.PortViewModel;
 import org.gecko.viewmodel.SystemViewModel;
 import org.gecko.viewmodel.ViewModelFactory;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/gecko/model/AutomatonTest.java b/src/test/java/org/gecko/model/AutomatonTest.java
index 85a399df..58eb8a94 100644
--- a/src/test/java/org/gecko/model/AutomatonTest.java
+++ b/src/test/java/org/gecko/model/AutomatonTest.java
@@ -59,7 +59,7 @@ static void setUp() {
             edge1 = new Edge(5, startState, ordinaryState, contract, Kind.HIT, 0);
             edge2 = new Edge(6, startState, ordinaryState, contract, Kind.MISS, 1);
         } catch (ModelException e) {
-                fail("Edges for testing purposes of the automaton could not be initialized.");
+            fail("Edges for testing purposes of the automaton could not be initialized.");
         }
     }
 
diff --git a/src/test/java/org/gecko/model/EdgeTest.java b/src/test/java/org/gecko/model/EdgeTest.java
index aa8d46c9..b8f59618 100644
--- a/src/test/java/org/gecko/model/EdgeTest.java
+++ b/src/test/java/org/gecko/model/EdgeTest.java
@@ -29,8 +29,7 @@ static void setUp() {
 
         // Edge can get null source / destination. @nonnull onParam!!
 
-        assertThrows(ModelException.class,
-            () -> edge = new Edge(2, source, destination, contract, Kind.HIT, -5));
+        assertThrows(ModelException.class, () -> edge = new Edge(2, source, destination, contract, Kind.HIT, -5));
 
         try {
             edge = new Edge(2, source, destination, contract, Kind.HIT, 0);
diff --git a/src/test/java/org/gecko/model/ElementTest.java b/src/test/java/org/gecko/model/ElementTest.java
index 33f0bef6..13d142a8 100644
--- a/src/test/java/org/gecko/model/ElementTest.java
+++ b/src/test/java/org/gecko/model/ElementTest.java
@@ -15,8 +15,10 @@ public class ElementTest {
 
     @BeforeAll
     static void setUp() {
-        assertThrows(ModelException.class, () -> element = new Element(-1){});
-        assertDoesNotThrow(() -> element = new Element(0) {});
+        assertThrows(ModelException.class, () -> element = new Element(-1) {
+        });
+        assertDoesNotThrow(() -> element = new Element(0) {
+        });
     }
 
     @Test
@@ -29,8 +31,10 @@ void testEquals() {
         assertTrue(element.equals(element));
 
         final Element[] other = new Element[4];
-        assertDoesNotThrow(() -> other[0] = new Element(1) {});
-        assertDoesNotThrow(() -> other[1] = new Element(0) {});
+        assertDoesNotThrow(() -> other[0] = new Element(1) {
+        });
+        assertDoesNotThrow(() -> other[1] = new Element(0) {
+        });
 
         assertDoesNotThrow(() -> other[2] = new State(2, "state"));
         assertDoesNotThrow(() -> other[3] = new State(0, "state"));
diff --git a/src/test/java/org/gecko/model/RegionTest.java b/src/test/java/org/gecko/model/RegionTest.java
index 41b33957..5e21673c 100644
--- a/src/test/java/org/gecko/model/RegionTest.java
+++ b/src/test/java/org/gecko/model/RegionTest.java
@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -27,8 +26,8 @@ static void setUp() {
         assertDoesNotThrow(() -> condition = new Condition("true"));
         assertDoesNotThrow(() -> preAndPostCondition = new Contract(0, "contract", condition, condition));
 
-        assertDoesNotThrow(() -> regionWithValidConditions = new Region(2, "region", condition,
-            new Contract(3, "preAndPost", condition, condition)));
+        assertDoesNotThrow(() -> regionWithValidConditions =
+            new Region(2, "region", condition, new Contract(3, "preAndPost", condition, condition)));
 
         assertDoesNotThrow(() -> state1 = new State(4, "state1"));
         assertDoesNotThrow(() -> state2 = new State(5, "state2"));
@@ -38,9 +37,8 @@ static void setUp() {
     void testInitializationOfRegionWithNullConditions() {
         assertThrows(NullPointerException.class,
             () -> regionWithNullConditions = new Region(1, "region", condition, null));
-        assertThrows(NullPointerException.class,
-            () -> regionWithNullConditions = new Region(1, "region", null,
-                new Contract(3, "preAndPost", condition, condition)));
+        assertThrows(NullPointerException.class, () -> regionWithNullConditions =
+            new Region(1, "region", null, new Contract(3, "preAndPost", condition, condition)));
     }
 
     @Test
diff --git a/src/test/java/org/gecko/model/StateTest.java b/src/test/java/org/gecko/model/StateTest.java
index 60b0446f..647f50c3 100644
--- a/src/test/java/org/gecko/model/StateTest.java
+++ b/src/test/java/org/gecko/model/StateTest.java
@@ -24,10 +24,10 @@ static void setUp() {
         assertThrows(ModelException.class, () -> state = new State(0, ""));
         assertDoesNotThrow(() -> state = new State(0, "state"));
 
-        assertDoesNotThrow(() -> contract1
-            = new Contract(1, "contract1", new Condition("true"), new Condition("true")));
-        assertDoesNotThrow(() -> contract2
-            = new Contract(2, "contract2", new Condition("false"), new Condition("false")));
+        assertDoesNotThrow(
+            () -> contract1 = new Contract(1, "contract1", new Condition("true"), new Condition("true")));
+        assertDoesNotThrow(
+            () -> contract2 = new Contract(2, "contract2", new Condition("false"), new Condition("false")));
     }
 
     @Test
diff --git a/src/test/java/org/gecko/model/SystemTest.java b/src/test/java/org/gecko/model/SystemTest.java
index 1f40df40..d70b8bc0 100644
--- a/src/test/java/org/gecko/model/SystemTest.java
+++ b/src/test/java/org/gecko/model/SystemTest.java
@@ -28,14 +28,12 @@ public class SystemTest {
 
     @BeforeAll
     static void setUp() {
-        assertThrows(NullPointerException.class,
-            () -> system = new System(0, null, null, new Automaton()));
+        assertThrows(NullPointerException.class, () -> system = new System(0, null, null, new Automaton()));
         assertThrows(ModelException.class, () -> system = new System(0, "", null, new Automaton()));
 
         assertThrows(ModelException.class, () -> system = new System(0, "system", "", new Automaton()));
 
-        assertThrows(NullPointerException.class,
-            () -> system = new System(0, "system", null, null));
+        assertThrows(NullPointerException.class, () -> system = new System(0, "system", null, null));
 
         assertDoesNotThrow(() -> system = new System(0, "system", null, new Automaton()));
         assertDoesNotThrow(() -> child1 = new System(1, "child1", null, new Automaton()));
diff --git a/src/test/java/org/gecko/model/VariableTest.java b/src/test/java/org/gecko/model/VariableTest.java
index 73522eea..3fd52e0f 100644
--- a/src/test/java/org/gecko/model/VariableTest.java
+++ b/src/test/java/org/gecko/model/VariableTest.java
@@ -14,15 +14,12 @@ public class VariableTest {
 
     @BeforeAll
     static void setUp() {
-        assertThrows(NullPointerException.class,
-            () -> variable = new Variable(0, null, "int", Visibility.INPUT));
-        assertThrows(NullPointerException.class,
-            () -> variable = new Variable(0, "variable", null, Visibility.INPUT));
+        assertThrows(NullPointerException.class, () -> variable = new Variable(0, null, "int", Visibility.INPUT));
+        assertThrows(NullPointerException.class, () -> variable = new Variable(0, "variable", null, Visibility.INPUT));
 
 
         assertThrows(ModelException.class, () -> variable = new Variable(0, "", null, Visibility.INPUT));
-        assertThrows(ModelException.class,
-            () -> variable = new Variable(0, "variable", "", Visibility.INPUT));
+        assertThrows(ModelException.class, () -> variable = new Variable(0, "variable", "", Visibility.INPUT));
 
         assertDoesNotThrow(() -> variable = new Variable(0, "variable", "int", Visibility.INPUT));
     }
diff --git a/src/test/java/org/gecko/viewmodel/ViewModelFactoryTest.java b/src/test/java/org/gecko/viewmodel/ViewModelFactoryTest.java
index 4820ba34..aa068f2c 100644
--- a/src/test/java/org/gecko/viewmodel/ViewModelFactoryTest.java
+++ b/src/test/java/org/gecko/viewmodel/ViewModelFactoryTest.java
@@ -15,7 +15,6 @@
 import org.gecko.model.Region;
 import org.gecko.model.State;
 import org.gecko.model.System;
-import org.gecko.model.SystemConnection;
 import org.gecko.model.Variable;
 import org.gecko.util.TestHelper;
 import org.junit.jupiter.api.BeforeEach;