diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Turnout.java b/src/main/java/de/srsoftware/web4rail/tiles/Turnout.java
index d2bbdb7..2576dea 100644
--- a/src/main/java/de/srsoftware/web4rail/tiles/Turnout.java
+++ b/src/main/java/de/srsoftware/web4rail/tiles/Turnout.java
@@ -2,6 +2,7 @@ package de.srsoftware.web4rail.tiles;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
@@ -12,10 +13,9 @@ import de.srsoftware.web4rail.Command;
 import de.srsoftware.web4rail.Command.Reply;
 import de.srsoftware.web4rail.Device;
 import de.srsoftware.web4rail.Protocol;
+import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
-import de.srsoftware.web4rail.tags.Form;
 import de.srsoftware.web4rail.tags.Input;
-import de.srsoftware.web4rail.tags.Label;
 import de.srsoftware.web4rail.tags.Radio;
 
 /**
@@ -112,16 +112,15 @@ public abstract class Turnout extends Tile implements Device{
 		return super.load(json);
 	}
 	
-	public Form propForm(String id) {
-		Form form = new Form(id);
-		Fieldset fieldset = new Fieldset(t("Decoder settings"));
-		Label protocol = new Label(t("Protocol:"));
+	@Override
+	protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
+		Tag div = new Tag("div");
 		for (Protocol proto : Protocol.values()) {
-			new Radio(PROTOCOL, proto.toString(), t(proto.toString()), proto == this.protocol).addTo(protocol);
+			new Radio(PROTOCOL, proto.toString(), t(proto.toString()), proto == protocol).addTo(div);
 		}
-		protocol.addTo(fieldset).addTo(form);
-		new Input(ADDRESS, address).numeric().addTo(new Label(t("Address:")+NBSP)).addTo(fieldset);
-		return form;
+		formInputs.add(t("Protocol"),div);
+		formInputs.add(t("Address:"),new Input(ADDRESS, address).numeric());
+		return super.properties(preForm, formInputs, postForm);
 	}
 	
 	private char proto() {
diff --git a/src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java b/src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java
index a3da23c..a188132 100644
--- a/src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java
+++ b/src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java
@@ -2,12 +2,11 @@ package de.srsoftware.web4rail.tiles;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 
-import de.srsoftware.tools.Tag;
+import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
-import de.srsoftware.web4rail.tags.Form;
 import de.srsoftware.web4rail.tags.Input;
-import de.srsoftware.web4rail.tags.Label;
 
 public class TurnoutL extends Turnout {
 
@@ -35,20 +34,12 @@ public class TurnoutL extends Turnout {
 	}
 	
 	@Override
-	public Form propForm(String id) {
-		Form form = super.propForm(id);
-		Tag fieldset = null;
-		for (Tag child : form.children()) {
-			if (child.is(Fieldset.TYPE)) {
-				fieldset = child;
-				break;
-			}
-		}
-		new Input(STRAIGHT, portA).numeric().addTo(new Label(t("Straight port:")+NBSP)).addTo(fieldset);
-		new Input(LEFT, portB).numeric().addTo(new Label(t("Left port:")+NBSP)).addTo(fieldset);
-		return form;
+	protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
+		formInputs.add(t("Straight port:"),new Input(STRAIGHT, portA).numeric());
+		formInputs.add(t("Left port:"),new Input(LEFT, portB).numeric());
+		return super.properties(preForm, formInputs, postForm);
 	}
-		
+	
 	@Override
 	public Tile update(HashMap<String, String> params) {
 		if (params.containsKey(STRAIGHT)) portA = Integer.parseInt(params.get(STRAIGHT));
diff --git a/src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java b/src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java
index e42c6d2..4e6d1be 100644
--- a/src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java
+++ b/src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java
@@ -2,12 +2,11 @@ package de.srsoftware.web4rail.tiles;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 
-import de.srsoftware.tools.Tag;
+import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
-import de.srsoftware.web4rail.tags.Form;
 import de.srsoftware.web4rail.tags.Input;
-import de.srsoftware.web4rail.tags.Label;
 
 public class TurnoutR extends Turnout {
 	
@@ -36,18 +35,10 @@ public class TurnoutR extends Turnout {
 	}
 	
 	@Override
-	public Form propForm(String id) {
-		Form form = super.propForm(id);
-		Tag fieldset = null;
-		for (Tag child : form.children()) {
-			if (child.is(Fieldset.TYPE)) {
-				fieldset = child;
-				break;
-			}
-		}
-		new Input(STRAIGHT, portA).numeric().addTo(new Label(t("Straight port:")+NBSP)).addTo(fieldset);
-		new Input(RIGHT, portB).numeric().addTo(new Label(t("Right port:")+NBSP)).addTo(fieldset);
-		return form;
+	protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
+		formInputs.add(t("Straight port:"),new Input(STRAIGHT, portA).numeric());
+		formInputs.add(t("Right port:"),new Input(RIGHT, portB).numeric());
+		return super.properties(preForm, formInputs, postForm);
 	}
 	
 	@Override