diff --git a/src/Logic/Web/Orientation.ts b/src/Sensors/Orientation.ts
similarity index 98%
rename from src/Logic/Web/Orientation.ts
rename to src/Sensors/Orientation.ts
index 9177f93a2d..149fdfeb8c 100644
--- a/src/Logic/Web/Orientation.ts
+++ b/src/Sensors/Orientation.ts
@@ -1,4 +1,4 @@
-import { Stores, UIEventSource } from "../UIEventSource"
+import { UIEventSource, Stores } from "../Logic/UIEventSource"
 
 /**
  * Exports the device orientation as UIEventSources and detects 'shakes'
diff --git a/src/UI/BigComponents/GeolocationControl.svelte b/src/UI/BigComponents/GeolocationControl.svelte
index f323f263b6..8e4f27a13e 100644
--- a/src/UI/BigComponents/GeolocationControl.svelte
+++ b/src/UI/BigComponents/GeolocationControl.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import Crosshair from "../../assets/svg/Crosshair.svelte"
   import Location_refused from "../../assets/svg/Location_refused.svelte"
   import { Store } from "../../Logic/UIEventSource.js"
   import type { GeolocationPermissionState } from "../../Logic/State/GeoLocationState.js"
diff --git a/src/UI/Debug/OrientationDebugPanel.svelte b/src/UI/Debug/OrientationDebugPanel.svelte
index c935a3fae9..578b2c1e7b 100644
--- a/src/UI/Debug/OrientationDebugPanel.svelte
+++ b/src/UI/Debug/OrientationDebugPanel.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Orientation } from "../../Logic/Web/Orientation"
+  import { Orientation } from "../../Sensors/Orientation"
 
   const o = Orientation.singleton
   let alpha = o.alpha
diff --git a/src/UI/InputElement/Helpers/SlopeInput.svelte b/src/UI/InputElement/Helpers/SlopeInput.svelte
index 835baddccd..662de7ce00 100644
--- a/src/UI/InputElement/Helpers/SlopeInput.svelte
+++ b/src/UI/InputElement/Helpers/SlopeInput.svelte
@@ -2,7 +2,7 @@
   import { ImmutableStore, UIEventSource } from "../../../Logic/UIEventSource"
   import Translations from "../../i18n/Translations"
   import Tr from "../../Base/Tr.svelte"
-  import { Orientation } from "../../../Logic/Web/Orientation"
+  import { Orientation } from "../../../Sensors/Orientation"
   import type { Feature } from "geojson"
   import { GeoOperations } from "../../../Logic/GeoOperations"
   import If from "../../Base/If.svelte"
diff --git a/src/UI/InputElement/Validators/SlopeValidator.ts b/src/UI/InputElement/Validators/SlopeValidator.ts
index 69cb6784e7..8409fa49bc 100644
--- a/src/UI/InputElement/Validators/SlopeValidator.ts
+++ b/src/UI/InputElement/Validators/SlopeValidator.ts
@@ -1,4 +1,3 @@
-import NatValidator from "./NatValidator"
 import FloatValidator from "./FloatValidator"
 
 export default class SlopeValidator extends FloatValidator {
@@ -9,10 +8,36 @@ export default class SlopeValidator extends FloatValidator {
                 "The accompanying input element uses the gyroscope and the compass to determine the correct incline. The sign of the incline will be set automatically. The bearing of the way is compared to the bearing of the compass, as such, the device knows if it is measuring in the forward or backward direction."
         )
     }
+
     isValid(str: string): boolean {
         if (str.endsWith("%") || str.endsWith("°")) {
             str = str.substring(0, str.length - 1)
         }
         return super.isValid(str)
     }
+
+    /**
+     *
+     * const v = new SlopeValidator()
+     * v.reformat("5%") // => "5%"
+     * v.reformat("5 %") // => "5%"
+     * v.reformat(" 5 %") // => "5%"
+     * v.reformat(" 5.0 %") // => "5%"
+     * v.reformat(" 5.0 % ") // => "5%"
+     * v.reformat(" -5.0 % ") // => "-5%"
+     * v.reformat("5") // => "5"
+     * v.reformat("5°") // => "5°"
+     *
+     *
+     *
+     */
+    reformat(str: string): string {
+        str = str.trim()
+        let lastChar = ""
+        if (str.endsWith("%") || str.endsWith("°")) {
+            lastChar = str.substring(str.length - 1)
+            str = str.substring(0, str.length - 1)
+        }
+        return super.reformat(str) + lastChar
+    }
 }
diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte
index 43acb1a666..9fde988e72 100644
--- a/src/UI/ThemeViewGUI.svelte
+++ b/src/UI/ThemeViewGUI.svelte
@@ -63,7 +63,7 @@
   import Favourites from "./Favourites/Favourites.svelte"
   import ImageOperations from "./Image/ImageOperations.svelte"
   import VisualFeedbackPanel from "./BigComponents/VisualFeedbackPanel.svelte"
-  import { Orientation } from "../Logic/Web/Orientation"
+  import { Orientation } from "../Sensors/Orientation"
   import GeolocationControl from "./BigComponents/GeolocationControl.svelte"
   import Compass_arrow from "../assets/svg/Compass_arrow.svelte"