diff --git a/src/main/resources/templates/af/PaceForm.html b/src/main/resources/templates/af/PaceForm.html
index efd59dd1..4486bc5b 100644
--- a/src/main/resources/templates/af/PaceForm.html
+++ b/src/main/resources/templates/af/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/af/start.html b/src/main/resources/templates/af/start.html
index 5af99021..3dd29dc3 100644
--- a/src/main/resources/templates/af/start.html
+++ b/src/main/resources/templates/af/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/ar/PaceForm.html b/src/main/resources/templates/ar/PaceForm.html
index ba2f4e3b..43b1e537 100644
--- a/src/main/resources/templates/ar/PaceForm.html
+++ b/src/main/resources/templates/ar/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/ar/start.html b/src/main/resources/templates/ar/start.html
index 9c408375..cb83fe8a 100644
--- a/src/main/resources/templates/ar/start.html
+++ b/src/main/resources/templates/ar/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/ca/PaceForm.html b/src/main/resources/templates/ca/PaceForm.html
index 66409c33..95051edf 100644
--- a/src/main/resources/templates/ca/PaceForm.html
+++ b/src/main/resources/templates/ca/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/cs/PaceForm.html b/src/main/resources/templates/cs/PaceForm.html
index cf397b5a..acd04c86 100644
--- a/src/main/resources/templates/cs/PaceForm.html
+++ b/src/main/resources/templates/cs/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/cs/navbar.html b/src/main/resources/templates/cs/navbar.html
index 4f158bee..c99827b5 100644
--- a/src/main/resources/templates/cs/navbar.html
+++ b/src/main/resources/templates/cs/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Start</a>
+            <a class="nav-link" href="/">Home</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Geschwindigkeit</a>
+            <a class="nav-link" href="/speed">Speed</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/da/PaceForm.html b/src/main/resources/templates/da/PaceForm.html
index 7090dd71..4591fc84 100644
--- a/src/main/resources/templates/da/PaceForm.html
+++ b/src/main/resources/templates/da/PaceForm.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
@@ -17,20 +17,30 @@ <h1>Pace Calculator</h1>
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
                                 Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
                                        type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
                             Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
                                    type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
                             Hour
@@ -62,10 +72,12 @@ <h1>Pace Calculator</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        The average pace is <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minutes per
-                        Kiloemter
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and
-                        <span th:text="${form.meter}">0</span> meter in
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
                         <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
                         <span th:text="${form.second}">0</span> seconds.
                     </p>
diff --git a/src/main/resources/templates/da/SpeedForm.html b/src/main/resources/templates/da/SpeedForm.html
index c96296c9..922caa6b 100644
--- a/src/main/resources/templates/da/SpeedForm.html
+++ b/src/main/resources/templates/da/SpeedForm.html
@@ -7,10 +7,10 @@
     <title>Speed Calculator</title>
 </head>
 <body>
-<div th:insert="navbar :: navbar(speed)">  </div>
+<div th:insert="navbar :: navbar(speed)"></div>
 <div class="container">
     <div class="row">
-        <h1>Speed Calculator</h1>
+        <h1>Geschwindigkeitsrechner</h1>
     </div>
     <div class="row">
         <div class="col-sm">
@@ -21,36 +21,31 @@ <h1>Speed Calculator</h1>
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                       type="text" value="30">
+                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                                type="text" value="30">
                             </label>
                         </div>
                         <div class="form-group"><label>
-                            Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
-                                   type="text" value="0">
+                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
+                                        type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Hour
-                            <input autocomplete="off" class="form-control" th:field="*{hour}"
-                                   type="text" value="1">
+                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
+                                            type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute
-                            <input autocomplete="off" class="form-control" th:field="*{minute}"
-                                   type="text" value="0">
+                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
+                                            type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Second
-                            <input autocomplete="off" class="form-control" th:field="*{second}"
-                                   type="text" value="0">
+                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
+                                             type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Calculate</button>
+                        <button class="btn btn-primary" type="submit">Berechne</button>
                     </form>
                 </div>
             </div>
@@ -60,13 +55,15 @@ <h1>Speed Calculator</h1>
         <div class="col-sm">
             <div class="card" th:if="${speed != null}">
                 <div class="card-body">
-                    <h5 class="card-title">Speed</h5>
+                    <h5 class="card-title">Geschwindigkeit</h5>
                     <p class="card-text">
-                        The average speed is <span th:text="${speed?.kilometerPerHour.speed}">30</span> km/h
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and <span
-                            th:text="${form.meter}">0</span> meter in
-                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute
-                        <span th:text="${form.second}">0</span> seconds.
+                        Die durchschnittliche Geschwindigkeit ist <span
+                            th:text="${speed?.kilometerPerHour.speed}">30</span> km/h, wenn man
+                        <span th:text="${form.kilometer}">30</span> Kilometer and <span
+                            th:text="${form.meter}">0</span> Meter in
+                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
+                        Minute(n)
+                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/da/navbar.html b/src/main/resources/templates/da/navbar.html
index 6374bd12..731ca2cc 100644
--- a/src/main/resources/templates/da/navbar.html
+++ b/src/main/resources/templates/da/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/da/start.html b/src/main/resources/templates/da/start.html
index eda4cf13..66250c50 100644
--- a/src/main/resources/templates/da/start.html
+++ b/src/main/resources/templates/da/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/de/PaceForm.html b/src/main/resources/templates/de/PaceForm.html
index f113817f..73b12f7e 100644
--- a/src/main/resources/templates/de/PaceForm.html
+++ b/src/main/resources/templates/de/PaceForm.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
@@ -17,42 +17,42 @@ <h1>Pace Rechner</h1>
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
                                 Kilometer<input autocomplete="off" class="form-control" th:field="*{major}"
-                                                type="text" value="30">
+                                       type="text" value="30">
                             </label>
                             <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
                                 <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
-                                <option th:text="miles" th:value="miles">Meilen</option>
-                                <option th:text="nautical" th:value="nautical">Seemeilens</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
                             </select>
                         </div>
+
                         <div class="form-group"><label>
                             Meter<input autocomplete="off" class="form-control" th:field="*{minor}"
-                                        type="text" value="0">
+                                   type="text" value="0">
                         </label>
                             <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
                                 <option th:text="Meter" th:value="meter">Meter</option>
-                                <option th:text="yards" th:value="yards">Yards</option>
-                                <option th:text="fathoms" th:value="fathoms">Faden</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
                             </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Stunde<input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute<input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Sekunde<input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <button class="btn btn-primary" type="submit">Berechne</button>
@@ -67,14 +67,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.major}">30</span> Kilometer und
-                        <span th:text="${form.minor}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/de/navbar.html b/src/main/resources/templates/de/navbar.html
index 3068e708..206abeae 100644
--- a/src/main/resources/templates/de/navbar.html
+++ b/src/main/resources/templates/de/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/de/start.html b/src/main/resources/templates/de/start.html
index 4ae97873..c1fca3b8 100644
--- a/src/main/resources/templates/de/start.html
+++ b/src/main/resources/templates/de/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/el/PaceForm.html b/src/main/resources/templates/el/PaceForm.html
index 7937bbc4..a313e630 100644
--- a/src/main/resources/templates/el/PaceForm.html
+++ b/src/main/resources/templates/el/PaceForm.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
@@ -17,20 +17,30 @@ <h1>Pace Calculator</h1>
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
                                 Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
                                        type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
                             Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
                                    type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
                             Hour
@@ -62,10 +72,12 @@ <h1>Pace Calculator</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        The average pace is <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minutes per
-                        Kiloemter
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and
-                        <span th:text="${form.meter}">0</span> meter in
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
                         <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
                         <span th:text="${form.second}">0</span> seconds.
                     </p>
diff --git a/src/main/resources/templates/el/SpeedForm.html b/src/main/resources/templates/el/SpeedForm.html
index 662b6be1..f7e51645 100644
--- a/src/main/resources/templates/el/SpeedForm.html
+++ b/src/main/resources/templates/el/SpeedForm.html
@@ -7,10 +7,10 @@
     <title>Speed Calculator</title>
 </head>
 <body>
-<div th:insert="navbar :: navbar(speed)">  </div>
+<div th:insert="navbar :: navbar(speed)"></div>
 <div class="container">
     <div class="row">
-        <h1>Speed Calculator</h1>
+        <h1>Geschwindigkeitsrechner</h1>
     </div>
     <div class="row">
         <div class="col-sm">
@@ -21,36 +21,31 @@ <h1>Speed Calculator</h1>
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                       type="text" value="30">
+                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                                type="text" value="30">
                             </label>
                         </div>
                         <div class="form-group"><label>
-                            Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
-                                   type="text" value="0">
+                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
+                                        type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Hour
-                            <input autocomplete="off" class="form-control" th:field="*{hour}"
-                                   type="text" value="1">
+                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
+                                            type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute
-                            <input autocomplete="off" class="form-control" th:field="*{minute}"
-                                   type="text" value="0">
+                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
+                                            type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Second
-                            <input autocomplete="off" class="form-control" th:field="*{second}"
-                                   type="text" value="0">
+                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
+                                             type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Calculate</button>
+                        <button class="btn btn-primary" type="submit">Berechne</button>
                     </form>
                 </div>
             </div>
@@ -60,13 +55,15 @@ <h1>Speed Calculator</h1>
         <div class="col-sm">
             <div class="card" th:if="${speed != null}">
                 <div class="card-body">
-                    <h5 class="card-title">Speed</h5>
+                    <h5 class="card-title">Geschwindigkeit</h5>
                     <p class="card-text">
-                        The average speed is <span th:text="${speed?.kilometerPerHour.speed}">30</span> km/h
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and <span
-                            th:text="${form.meter}">0</span> meter in
-                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute
-                        <span th:text="${form.second}">0</span> seconds.
+                        Die durchschnittliche Geschwindigkeit ist <span
+                            th:text="${speed?.kilometerPerHour.speed}">30</span> km/h, wenn man
+                        <span th:text="${form.kilometer}">30</span> Kilometer and <span
+                            th:text="${form.meter}">0</span> Meter in
+                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
+                        Minute(n)
+                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/el/navbar.html b/src/main/resources/templates/el/navbar.html
index f958b72a..013790f1 100644
--- a/src/main/resources/templates/el/navbar.html
+++ b/src/main/resources/templates/el/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/el/start.html b/src/main/resources/templates/el/start.html
index fbc7dd13..67eafee6 100644
--- a/src/main/resources/templates/el/start.html
+++ b/src/main/resources/templates/el/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/en/PaceForm.html b/src/main/resources/templates/en/PaceForm.html
index 9b8efdb3..09314a03 100644
--- a/src/main/resources/templates/en/PaceForm.html
+++ b/src/main/resources/templates/en/PaceForm.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html lang="nl" xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
@@ -17,20 +17,30 @@ <h1>Pace Calculator</h1>
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
                                 Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
                                        type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
                             Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
                                    type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
                             Hour
@@ -62,10 +72,12 @@ <h1>Pace Calculator</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        The average pace is <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minutes per
-                        Kiloemter
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and
-                        <span th:text="${form.meter}">0</span> meter in
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
                         <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
                         <span th:text="${form.second}">0</span> seconds.
                     </p>
diff --git a/src/main/resources/templates/en/SpeedForm.html b/src/main/resources/templates/en/SpeedForm.html
index 7bb4ef6d..67dc91fd 100644
--- a/src/main/resources/templates/en/SpeedForm.html
+++ b/src/main/resources/templates/en/SpeedForm.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="nl" xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
@@ -10,7 +10,7 @@
 <div th:insert="navbar :: navbar(speed)"></div>
 <div class="container">
     <div class="row">
-        <h1>Speed Calculator</h1>
+        <h1>Geschwindigkeitsrechner</h1>
     </div>
     <div class="row">
         <div class="col-sm">
@@ -21,36 +21,31 @@ <h1>Speed Calculator</h1>
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                       type="text" value="30">
+                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                                type="text" value="30">
                             </label>
                         </div>
                         <div class="form-group"><label>
-                            Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
-                                   type="text" value="0">
+                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
+                                        type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Hour
-                            <input autocomplete="off" class="form-control" th:field="*{hour}"
-                                   type="text" value="1">
+                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
+                                            type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute
-                            <input autocomplete="off" class="form-control" th:field="*{minute}"
-                                   type="text" value="0">
+                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
+                                            type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Second
-                            <input autocomplete="off" class="form-control" th:field="*{second}"
-                                   type="text" value="0">
+                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
+                                             type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Calculate</button>
+                        <button class="btn btn-primary" type="submit">Berechne</button>
                     </form>
                 </div>
             </div>
@@ -60,13 +55,15 @@ <h1>Speed Calculator</h1>
         <div class="col-sm">
             <div class="card" th:if="${speed != null}">
                 <div class="card-body">
-                    <h5 class="card-title">Speed</h5>
+                    <h5 class="card-title">Geschwindigkeit</h5>
                     <p class="card-text">
-                        The average speed is <span th:text="${speed?.kilometerPerHour.speed}">30</span> km/h
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and <span
-                            th:text="${form.meter}">0</span> meter in
-                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute
-                        <span th:text="${form.second}">0</span> seconds.
+                        Die durchschnittliche Geschwindigkeit ist <span
+                            th:text="${speed?.kilometerPerHour.speed}">30</span> km/h, wenn man
+                        <span th:text="${form.kilometer}">30</span> Kilometer and <span
+                            th:text="${form.meter}">0</span> Meter in
+                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
+                        Minute(n)
+                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/en/navbar.html b/src/main/resources/templates/en/navbar.html
index af69db7c..53d1a29d 100644
--- a/src/main/resources/templates/en/navbar.html
+++ b/src/main/resources/templates/en/navbar.html
@@ -1,12 +1,12 @@
-<html lang="nl" xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <body>
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/en/start.html b/src/main/resources/templates/en/start.html
index d9849a08..df57ccd0 100644
--- a/src/main/resources/templates/en/start.html
+++ b/src/main/resources/templates/en/start.html
@@ -1,4 +1,4 @@
-<html lang="nl" xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
@@ -7,7 +7,7 @@
     <title>Start</title>
 </head>
 <body>
-<div th:insert="navbar :: navbar(start)"></div>
-<H1>Welcome to Sport Tool Box</H1>
+<div th:insert="navbar :: navbar(start)">  </div>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/es/PaceForm.html b/src/main/resources/templates/es/PaceForm.html
index 83bc9c03..fe918f35 100644
--- a/src/main/resources/templates/es/PaceForm.html
+++ b/src/main/resources/templates/es/PaceForm.html
@@ -21,14 +21,24 @@ <h1>Pace Rechner</h1>
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                Kilometer<input autocomplete="off" class="form-control" th:field="*{major}"
                                                 type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">Meilen</option>
+                                <option th:text="nautical" th:value="nautical">Seemeilens</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
+                            Meter<input autocomplete="off" class="form-control" th:field="*{minor}"
                                         type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">Yards</option>
+                                <option th:text="fathoms" th:value="fathoms">Faden</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
                             Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
@@ -57,11 +67,12 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
+                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.toString()}">30</span>
+                        Minuten
                         pro
                         Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
+                        <span th:text="${form.major}">30</span> Kilometer und
+                        <span th:text="${form.minor}">0</span> Meter in
                         <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
                         Minute(n) und
                         <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
diff --git a/src/main/resources/templates/es/navbar.html b/src/main/resources/templates/es/navbar.html
index 21d01b09..a78b6362 100644
--- a/src/main/resources/templates/es/navbar.html
+++ b/src/main/resources/templates/es/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/fi/PaceForm.html b/src/main/resources/templates/fi/PaceForm.html
index 45ada7be..adb0c9b3 100644
--- a/src/main/resources/templates/fi/PaceForm.html
+++ b/src/main/resources/templates/fi/PaceForm.html
@@ -10,7 +10,7 @@
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Calculator</h1>
+        <h1>Pace Rechner</h1>
     </div>
     <div class="row">
         <div class="col-sm">
@@ -21,36 +21,41 @@ <h1>Pace Calculator</h1>
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                       type="text" value="30">
+                                Kilometer<input autocomplete="off" class="form-control" th:field="*{major}"
+                                                type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">Meilen</option>
+                                <option th:text="nautical" th:value="nautical">Seemeilens</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
-                                   type="text" value="0">
+                            Meter<input autocomplete="off" class="form-control" th:field="*{minor}"
+                                        type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">Yards</option>
+                                <option th:text="fathoms" th:value="fathoms">Faden</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Hour
-                            <input autocomplete="off" class="form-control" th:field="*{hour}"
-                                   type="text" value="1">
+                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
+                                            type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute
-                            <input autocomplete="off" class="form-control" th:field="*{minute}"
-                                   type="text" value="0">
+                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
+                                            type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Second
-                            <input autocomplete="off" class="form-control" th:field="*{second}"
-                                   type="text" value="0">
+                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
+                                             type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Calculate</button>
+                        <button class="btn btn-primary" type="submit">Berechne</button>
                     </form>
                 </div>
             </div>
@@ -62,12 +67,15 @@ <h1>Pace Calculator</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        The average pace is <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minutes per
-                        Kiloemter
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and
-                        <span th:text="${form.meter}">0</span> meter in
-                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
-                        <span th:text="${form.second}">0</span> seconds.
+                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.toString()}">30</span>
+                        Minuten
+                        pro
+                        Kilometer, wenn man
+                        <span th:text="${form.major}">30</span> Kilometer und
+                        <span th:text="${form.minor}">0</span> Meter in
+                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
+                        Minute(n) und
+                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/fi/SpeedForm.html b/src/main/resources/templates/fi/SpeedForm.html
index bb10105b..d0731747 100644
--- a/src/main/resources/templates/fi/SpeedForm.html
+++ b/src/main/resources/templates/fi/SpeedForm.html
@@ -7,10 +7,10 @@
     <title>Speed Calculator</title>
 </head>
 <body>
-<div th:insert="navbar :: navbar(speed)">  </div>
+<div th:insert="navbar :: navbar(speed)"></div>
 <div class="container">
     <div class="row">
-        <h1>Speed Calculator</h1>
+        <h1>Geschwindigkeitsrechner</h1>
     </div>
     <div class="row">
         <div class="col-sm">
@@ -21,36 +21,31 @@ <h1>Speed Calculator</h1>
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                       type="text" value="30">
+                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                                type="text" value="30">
                             </label>
                         </div>
                         <div class="form-group"><label>
-                            Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
-                                   type="text" value="0">
+                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
+                                        type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Hour
-                            <input autocomplete="off" class="form-control" th:field="*{hour}"
-                                   type="text" value="1">
+                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
+                                            type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute
-                            <input autocomplete="off" class="form-control" th:field="*{minute}"
-                                   type="text" value="0">
+                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
+                                            type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Second
-                            <input autocomplete="off" class="form-control" th:field="*{second}"
-                                   type="text" value="0">
+                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
+                                             type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Calculate</button>
+                        <button class="btn btn-primary" type="submit">Berechne</button>
                     </form>
                 </div>
             </div>
@@ -60,13 +55,15 @@ <h1>Speed Calculator</h1>
         <div class="col-sm">
             <div class="card" th:if="${speed != null}">
                 <div class="card-body">
-                    <h5 class="card-title">Speed</h5>
+                    <h5 class="card-title">Geschwindigkeit</h5>
                     <p class="card-text">
-                        The average speed is <span th:text="${speed?.kilometerPerHour.speed}">30</span> km/h
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and <span
-                            th:text="${form.meter}">0</span> meter in
-                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute
-                        <span th:text="${form.second}">0</span> seconds.
+                        Die durchschnittliche Geschwindigkeit ist <span
+                            th:text="${speed?.kilometerPerHour.speed}">30</span> km/h, wenn man
+                        <span th:text="${form.kilometer}">30</span> Kilometer and <span
+                            th:text="${form.meter}">0</span> Meter in
+                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
+                        Minute(n)
+                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/fi/navbar.html b/src/main/resources/templates/fi/navbar.html
index e25d1eaf..00b2690a 100644
--- a/src/main/resources/templates/fi/navbar.html
+++ b/src/main/resources/templates/fi/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/fi/start.html b/src/main/resources/templates/fi/start.html
index 3362e890..414e8930 100644
--- a/src/main/resources/templates/fi/start.html
+++ b/src/main/resources/templates/fi/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/fr/PaceForm.html b/src/main/resources/templates/fr/PaceForm.html
index 9786706f..b212ca09 100644
--- a/src/main/resources/templates/fr/PaceForm.html
+++ b/src/main/resources/templates/fr/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/fr/navbar.html b/src/main/resources/templates/fr/navbar.html
index 0d5a752e..643ed583 100644
--- a/src/main/resources/templates/fr/navbar.html
+++ b/src/main/resources/templates/fr/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/fr/start.html b/src/main/resources/templates/fr/start.html
index 073a5219..f621a3b2 100644
--- a/src/main/resources/templates/fr/start.html
+++ b/src/main/resources/templates/fr/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/he/PaceForm.html b/src/main/resources/templates/he/PaceForm.html
index 9ce6cc2f..3fc702bd 100644
--- a/src/main/resources/templates/he/PaceForm.html
+++ b/src/main/resources/templates/he/PaceForm.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
@@ -17,20 +17,30 @@ <h1>Pace Calculator</h1>
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
                                 Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
                                        type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
                             Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
                                    type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
                             Hour
@@ -62,10 +72,12 @@ <h1>Pace Calculator</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        The average pace is <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minutes per
-                        Kiloemter
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and
-                        <span th:text="${form.meter}">0</span> meter in
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
                         <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
                         <span th:text="${form.second}">0</span> seconds.
                     </p>
diff --git a/src/main/resources/templates/he/SpeedForm.html b/src/main/resources/templates/he/SpeedForm.html
index db12f429..0e1e7b78 100644
--- a/src/main/resources/templates/he/SpeedForm.html
+++ b/src/main/resources/templates/he/SpeedForm.html
@@ -7,10 +7,10 @@
     <title>Speed Calculator</title>
 </head>
 <body>
-<div th:insert="navbar :: navbar(speed)">  </div>
+<div th:insert="navbar :: navbar(speed)"></div>
 <div class="container">
     <div class="row">
-        <h1>Speed Calculator</h1>
+        <h1>Geschwindigkeitsrechner</h1>
     </div>
     <div class="row">
         <div class="col-sm">
@@ -21,36 +21,31 @@ <h1>Speed Calculator</h1>
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                       type="text" value="30">
+                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                                type="text" value="30">
                             </label>
                         </div>
                         <div class="form-group"><label>
-                            Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
-                                   type="text" value="0">
+                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
+                                        type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Hour
-                            <input autocomplete="off" class="form-control" th:field="*{hour}"
-                                   type="text" value="1">
+                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
+                                            type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute
-                            <input autocomplete="off" class="form-control" th:field="*{minute}"
-                                   type="text" value="0">
+                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
+                                            type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Second
-                            <input autocomplete="off" class="form-control" th:field="*{second}"
-                                   type="text" value="0">
+                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
+                                             type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Calculate</button>
+                        <button class="btn btn-primary" type="submit">Berechne</button>
                     </form>
                 </div>
             </div>
@@ -60,13 +55,15 @@ <h1>Speed Calculator</h1>
         <div class="col-sm">
             <div class="card" th:if="${speed != null}">
                 <div class="card-body">
-                    <h5 class="card-title">Speed</h5>
+                    <h5 class="card-title">Geschwindigkeit</h5>
                     <p class="card-text">
-                        The average speed is <span th:text="${speed?.kilometerPerHour.speed}">30</span> km/h
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and <span
-                            th:text="${form.meter}">0</span> meter in
-                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute
-                        <span th:text="${form.second}">0</span> seconds.
+                        Die durchschnittliche Geschwindigkeit ist <span
+                            th:text="${speed?.kilometerPerHour.speed}">30</span> km/h, wenn man
+                        <span th:text="${form.kilometer}">30</span> Kilometer and <span
+                            th:text="${form.meter}">0</span> Meter in
+                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
+                        Minute(n)
+                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/he/navbar.html b/src/main/resources/templates/he/navbar.html
index 1469a6ec..fead91cb 100644
--- a/src/main/resources/templates/he/navbar.html
+++ b/src/main/resources/templates/he/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/he/start.html b/src/main/resources/templates/he/start.html
index 2cb73d63..a7a1df13 100644
--- a/src/main/resources/templates/he/start.html
+++ b/src/main/resources/templates/he/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/hu/PaceForm.html b/src/main/resources/templates/hu/PaceForm.html
index d17b0901..6730f993 100644
--- a/src/main/resources/templates/hu/PaceForm.html
+++ b/src/main/resources/templates/hu/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/hu/start.html b/src/main/resources/templates/hu/start.html
index 5b092a08..b21ae53d 100644
--- a/src/main/resources/templates/hu/start.html
+++ b/src/main/resources/templates/hu/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/it/PaceForm.html b/src/main/resources/templates/it/PaceForm.html
index 2374d4f3..66f7267a 100644
--- a/src/main/resources/templates/it/PaceForm.html
+++ b/src/main/resources/templates/it/PaceForm.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
@@ -17,20 +17,30 @@ <h1>Pace Calculator</h1>
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
                                 Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
                                        type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
                             Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
                                    type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
                             Hour
@@ -62,10 +72,12 @@ <h1>Pace Calculator</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        The average pace is <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minutes per
-                        Kiloemter
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and
-                        <span th:text="${form.meter}">0</span> meter in
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
                         <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
                         <span th:text="${form.second}">0</span> seconds.
                     </p>
diff --git a/src/main/resources/templates/ja/PaceForm.html b/src/main/resources/templates/ja/PaceForm.html
index 77fcdda6..2beb7a06 100644
--- a/src/main/resources/templates/ja/PaceForm.html
+++ b/src/main/resources/templates/ja/PaceForm.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
@@ -17,20 +17,30 @@ <h1>Pace Calculator</h1>
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
                                 Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
                                        type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
                             Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
                                    type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
                             Hour
@@ -62,10 +72,12 @@ <h1>Pace Calculator</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        The average pace is <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minutes per
-                        Kiloemter
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and
-                        <span th:text="${form.meter}">0</span> meter in
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
                         <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
                         <span th:text="${form.second}">0</span> seconds.
                     </p>
diff --git a/src/main/resources/templates/ja/SpeedForm.html b/src/main/resources/templates/ja/SpeedForm.html
index fdde0d85..f8240373 100644
--- a/src/main/resources/templates/ja/SpeedForm.html
+++ b/src/main/resources/templates/ja/SpeedForm.html
@@ -7,10 +7,10 @@
     <title>Speed Calculator</title>
 </head>
 <body>
-<div th:insert="navbar :: navbar(speed)">  </div>
+<div th:insert="navbar :: navbar(speed)"></div>
 <div class="container">
     <div class="row">
-        <h1>Speed Calculator</h1>
+        <h1>Geschwindigkeitsrechner</h1>
     </div>
     <div class="row">
         <div class="col-sm">
@@ -21,36 +21,31 @@ <h1>Speed Calculator</h1>
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                       type="text" value="30">
+                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                                type="text" value="30">
                             </label>
                         </div>
                         <div class="form-group"><label>
-                            Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
-                                   type="text" value="0">
+                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
+                                        type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Hour
-                            <input autocomplete="off" class="form-control" th:field="*{hour}"
-                                   type="text" value="1">
+                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
+                                            type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute
-                            <input autocomplete="off" class="form-control" th:field="*{minute}"
-                                   type="text" value="0">
+                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
+                                            type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Second
-                            <input autocomplete="off" class="form-control" th:field="*{second}"
-                                   type="text" value="0">
+                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
+                                             type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Calculate</button>
+                        <button class="btn btn-primary" type="submit">Berechne</button>
                     </form>
                 </div>
             </div>
@@ -60,13 +55,15 @@ <h1>Speed Calculator</h1>
         <div class="col-sm">
             <div class="card" th:if="${speed != null}">
                 <div class="card-body">
-                    <h5 class="card-title">Speed</h5>
+                    <h5 class="card-title">Geschwindigkeit</h5>
                     <p class="card-text">
-                        The average speed is <span th:text="${speed?.kilometerPerHour.speed}">30</span> km/h
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and <span
-                            th:text="${form.meter}">0</span> meter in
-                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute
-                        <span th:text="${form.second}">0</span> seconds.
+                        Die durchschnittliche Geschwindigkeit ist <span
+                            th:text="${speed?.kilometerPerHour.speed}">30</span> km/h, wenn man
+                        <span th:text="${form.kilometer}">30</span> Kilometer and <span
+                            th:text="${form.meter}">0</span> Meter in
+                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
+                        Minute(n)
+                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/ja/navbar.html b/src/main/resources/templates/ja/navbar.html
index fe2a75df..ade7ea0b 100644
--- a/src/main/resources/templates/ja/navbar.html
+++ b/src/main/resources/templates/ja/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/ja/start.html b/src/main/resources/templates/ja/start.html
index d0b4f5f0..8cd79e95 100644
--- a/src/main/resources/templates/ja/start.html
+++ b/src/main/resources/templates/ja/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/ko/PaceForm.html b/src/main/resources/templates/ko/PaceForm.html
index 7e685457..448a37d6 100644
--- a/src/main/resources/templates/ko/PaceForm.html
+++ b/src/main/resources/templates/ko/PaceForm.html
@@ -21,14 +21,24 @@ <h1>Pace Rechner</h1>
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                Kilometer<input autocomplete="off" class="form-control" th:field="*{major}"
                                                 type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">Meilen</option>
+                                <option th:text="nautical" th:value="nautical">Seemeilens</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
+                            Meter<input autocomplete="off" class="form-control" th:field="*{minor}"
                                         type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">Yards</option>
+                                <option th:text="fathoms" th:value="fathoms">Faden</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
                             Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
@@ -57,11 +67,12 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
+                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.toString()}">30</span>
+                        Minuten
                         pro
                         Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
+                        <span th:text="${form.major}">30</span> Kilometer und
+                        <span th:text="${form.minor}">0</span> Meter in
                         <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
                         Minute(n) und
                         <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
diff --git a/src/main/resources/templates/nl/PaceForm.html b/src/main/resources/templates/nl/PaceForm.html
index 9b8efdb3..6632759d 100644
--- a/src/main/resources/templates/nl/PaceForm.html
+++ b/src/main/resources/templates/nl/PaceForm.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
@@ -17,20 +17,30 @@ <h1>Pace Calculator</h1>
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
                                 Kilometer
-                                <input autocomplete="off" class="form-control" th:field="*{kilometer}"
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
                                        type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
                             Meter
-                            <input autocomplete="off" class="form-control" th:field="*{meter}"
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
                                    type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
                             Hour
@@ -62,10 +72,12 @@ <h1>Pace Calculator</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        The average pace is <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minutes per
-                        Kiloemter
-                        for travelling <span th:text="${form.kilometer}">30</span> kilometer and
-                        <span th:text="${form.meter}">0</span> meter in
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
                         <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
                         <span th:text="${form.second}">0</span> seconds.
                     </p>
diff --git a/src/main/resources/templates/nl/navbar.html b/src/main/resources/templates/nl/navbar.html
index af69db7c..ba6c806c 100644
--- a/src/main/resources/templates/nl/navbar.html
+++ b/src/main/resources/templates/nl/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/nl/start.html b/src/main/resources/templates/nl/start.html
index 2d8eb49a..598826af 100644
--- a/src/main/resources/templates/nl/start.html
+++ b/src/main/resources/templates/nl/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/no/PaceForm.html b/src/main/resources/templates/no/PaceForm.html
index 23478bc5..3f5ee592 100644
--- a/src/main/resources/templates/no/PaceForm.html
+++ b/src/main/resources/templates/no/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/pl/PaceForm.html b/src/main/resources/templates/pl/PaceForm.html
index ae7f5a1c..5afd1080 100644
--- a/src/main/resources/templates/pl/PaceForm.html
+++ b/src/main/resources/templates/pl/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/pl/navbar.html b/src/main/resources/templates/pl/navbar.html
index ad9fd711..bbb37066 100644
--- a/src/main/resources/templates/pl/navbar.html
+++ b/src/main/resources/templates/pl/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/pt/PaceForm.html b/src/main/resources/templates/pt/PaceForm.html
index 34663d1f..b8109dd9 100644
--- a/src/main/resources/templates/pt/PaceForm.html
+++ b/src/main/resources/templates/pt/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/pt/navbar.html b/src/main/resources/templates/pt/navbar.html
index 6258a281..4cd48775 100644
--- a/src/main/resources/templates/pt/navbar.html
+++ b/src/main/resources/templates/pt/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/pt/start.html b/src/main/resources/templates/pt/start.html
index a959e998..2fd82d1d 100644
--- a/src/main/resources/templates/pt/start.html
+++ b/src/main/resources/templates/pt/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/ro/PaceForm.html b/src/main/resources/templates/ro/PaceForm.html
index cc29e918..f2ca68ce 100644
--- a/src/main/resources/templates/ro/PaceForm.html
+++ b/src/main/resources/templates/ro/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/ro/navbar.html b/src/main/resources/templates/ro/navbar.html
index 466b695a..f7834103 100644
--- a/src/main/resources/templates/ro/navbar.html
+++ b/src/main/resources/templates/ro/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Start</a>
+            <a class="nav-link" href="/">Home</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Geschwindigkeit</a>
+            <a class="nav-link" href="/speed">Speed</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/ru/PaceForm.html b/src/main/resources/templates/ru/PaceForm.html
index 68d796ae..a10047ef 100644
--- a/src/main/resources/templates/ru/PaceForm.html
+++ b/src/main/resources/templates/ru/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/ru/navbar.html b/src/main/resources/templates/ru/navbar.html
index 0b5ef959..7e914d79 100644
--- a/src/main/resources/templates/ru/navbar.html
+++ b/src/main/resources/templates/ru/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/ru/start.html b/src/main/resources/templates/ru/start.html
index 55536855..da016ed9 100644
--- a/src/main/resources/templates/ru/start.html
+++ b/src/main/resources/templates/ru/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/sr/PaceForm.html b/src/main/resources/templates/sr/PaceForm.html
index 5bb06daa..82714eba 100644
--- a/src/main/resources/templates/sr/PaceForm.html
+++ b/src/main/resources/templates/sr/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/sr/navbar.html b/src/main/resources/templates/sr/navbar.html
index 00ade1aa..7de66f62 100644
--- a/src/main/resources/templates/sr/navbar.html
+++ b/src/main/resources/templates/sr/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/sv/PaceForm.html b/src/main/resources/templates/sv/PaceForm.html
index 07184dd2..232571c5 100644
--- a/src/main/resources/templates/sv/PaceForm.html
+++ b/src/main/resources/templates/sv/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/sv/navbar.html b/src/main/resources/templates/sv/navbar.html
index 245b11e8..44b8a3a4 100644
--- a/src/main/resources/templates/sv/navbar.html
+++ b/src/main/resources/templates/sv/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/sv/start.html b/src/main/resources/templates/sv/start.html
index 921806c6..f8250d42 100644
--- a/src/main/resources/templates/sv/start.html
+++ b/src/main/resources/templates/sv/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/tr/PaceForm.html b/src/main/resources/templates/tr/PaceForm.html
index 849a007a..48260143 100644
--- a/src/main/resources/templates/tr/PaceForm.html
+++ b/src/main/resources/templates/tr/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/tr/navbar.html b/src/main/resources/templates/tr/navbar.html
index 596e22f2..2733dc50 100644
--- a/src/main/resources/templates/tr/navbar.html
+++ b/src/main/resources/templates/tr/navbar.html
@@ -3,10 +3,10 @@
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark" th:fragment="navbar(active)">
     <ul class="navbar-nav">
         <li class="nav-item" th:class="${active == 'start'}? 'active' : null">
-            <a class="nav-link" href="/">Home</a>
+            <a class="nav-link" href="/">Start</a>
         </li>
         <li class="nav-item" th:class="${active == 'speed'}? 'active' : null">
-            <a class="nav-link" href="/speed">Speed</a>
+            <a class="nav-link" href="/speed">Geschwindigkeit</a>
         </li>
         <li class="nav-item" th:class="${active == 'pace'}? 'active' : null">
             <a class="nav-link" href="/pace">Pace</a>
diff --git a/src/main/resources/templates/tr/start.html b/src/main/resources/templates/tr/start.html
index f9d5f4cd..db3a8862 100644
--- a/src/main/resources/templates/tr/start.html
+++ b/src/main/resources/templates/tr/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/uk/PaceForm.html b/src/main/resources/templates/uk/PaceForm.html
index 07619c0f..91806ad2 100644
--- a/src/main/resources/templates/uk/PaceForm.html
+++ b/src/main/resources/templates/uk/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/vi/PaceForm.html b/src/main/resources/templates/vi/PaceForm.html
index 2a84b12c..a1aa6766 100644
--- a/src/main/resources/templates/vi/PaceForm.html
+++ b/src/main/resources/templates/vi/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/zh/PaceForm.html b/src/main/resources/templates/zh/PaceForm.html
index 8b32c389..a7127413 100644
--- a/src/main/resources/templates/zh/PaceForm.html
+++ b/src/main/resources/templates/zh/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>
