diff --git a/pom.xml b/pom.xml
index 76583c7..fcce1ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>1.4.19</version>
+	<version>1.4.20</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation
index 0a42987..16be29c 100644
--- a/resources/translations/Application.de.translation
+++ b/resources/translations/Application.de.translation
@@ -300,6 +300,7 @@ Seek in last : Durchsuche letzte
 Select block : Block auswählen
 Select car : Fahrzeug auswählen
 Select contact : Kotakt auswählen
+Select destination : Ziel wählen
 Select display : Anzeige auswählen
 Select from plan : Auf Plan auswählen
 Select object : Objekt auswählen
diff --git a/src/main/java/de/srsoftware/web4rail/Constants.java b/src/main/java/de/srsoftware/web4rail/Constants.java
index 0a2a296..73a44fd 100644
--- a/src/main/java/de/srsoftware/web4rail/Constants.java
+++ b/src/main/java/de/srsoftware/web4rail/Constants.java
@@ -60,8 +60,9 @@ public interface Constants {
 	public static final String  CONTEXT             = "context";
 	public static final String  DEFAULT_SPEED_UNIT  = "km/h";
 	public static final String  DEFAULT_LENGTH_UNIT = "mm";
+	public static final String DESTINATION          = "destination";
 	public static final String  DISABLED            = "disabled";
-	public static final String  DIRECTION            = "direction";
+	public static final String  DIRECTION           = "direction";
 	public static final String  GITHUB_URL          = "https://github.com/srsoftware-de/Web4Rail";
 	public static final String  ID                  = "id";
 	public static final String  LOCKED              = "locked";
diff --git a/src/main/java/de/srsoftware/web4rail/moving/Car.java b/src/main/java/de/srsoftware/web4rail/moving/Car.java
index 22967d8..d216542 100644
--- a/src/main/java/de/srsoftware/web4rail/moving/Car.java
+++ b/src/main/java/de/srsoftware/web4rail/moving/Car.java
@@ -319,7 +319,7 @@ public class Car extends BaseClass implements Comparable<Car>{
 		formInputs.add(t("Maximum Speed"),div);
 		if (isSet(train)) formInputs.add(t("Train"), train.link());
 		formInputs.add(t("Current orientation"),new Tag("span").content(orientation ? t("forward") : t("reverse")));
-		formInputs.add(t("driven distance"),new Tag("span").content(distanceCounter+" "+Plan.lengthUnit));
+		formInputs.add(t("driven distance"),new Tag("span").content(BaseClass.distance(distanceCounter)));
 		postForm.add(maintenance());
 		return super.properties(preForm,formInputs,postForm,errors);
 	}
diff --git a/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java b/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
index 16a8b8b..9668bca 100644
--- a/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
+++ b/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
@@ -189,7 +189,9 @@ public class Locomotive extends Car implements Constants,Device{
 		Button b4 = new Button(t("F4"),params);
 		if (fun4) b4.clazz("active");
 		b4.addTo(functions);
-		functions.addTo(fieldset);		
+		functions.addTo(fieldset);
+		
+		if (isSet(train)) train.button(t("Select destination"),Map.of(ACTION,ACTION_MOVE,ASSIGN,DESTINATION)).addTo(fieldset);
 
 		return fieldset;
 	}
diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java
index bbab858..f26c98e 100644
--- a/src/main/java/de/srsoftware/web4rail/moving/Train.java
+++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java
@@ -74,8 +74,6 @@ public class Train extends BaseClass implements Comparable<Train> {
 	
 	private static final String TAGS = "tags";
 
-	public static final String DESTINATION = "destination";
-
 	private static final String ACTION_REVERSE = "reverse";
 	public static final String DESTINATION_PREFIX = "@";
 	public static final char TURN_FLAG = '±';