diff --git a/assets/css/app.css b/assets/css/app.css
index 6558ada..926a3e2 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -107,11 +107,16 @@ body {
                     grid-gap: 0.5rem;
                     grid-template-columns: 2fr 3fr 30px;
                     align-items: center;
-                    input[type="text"], input[type="number"] {
+                    input[type="text"], input[type="number"], input[type="tel"] {
                         font-weight: bold;
                         border: var(--primary) 1px solid;
                         text-align: right;
                     }
+                    input::-webkit-outer-spin-button,
+                    input::-webkit-inner-spin-button {
+                        -webkit-appearance: none;
+                        margin: 0;
+                    }
                     .unit {
                         text-align: right;
                     }
diff --git a/views/daten.twig.htm b/views/daten.twig.htm
index 2f39618..7254190 100644
--- a/views/daten.twig.htm
+++ b/views/daten.twig.htm
@@ -24,22 +24,22 @@
 
             <label for="firstname">
                 <span>Vorname</span>
-                <input type="number" x-model="value.firstname" id="firstname">
+                <input type="text" x-model="value.firstname" id="firstname">
             </label>
 
             <label for="lastname">
                 <span>Nachname</span>
-                <input type="number" x-model="value.lastname" id="lastname">
+                <input type="text" x-model="value.lastname" id="lastname">
             </label>
 
             <label for="zip">
                 <span>PLZ</span>
-                <input type="number" x-model="value.zip" id="zip">
+                <input type="text" x-model="value.zip" id="zip">
             </label>
 
             <label for="location">
                 <span>Ort</span>
-                <input type="number" x-model="value.location" id="location">
+                <input type="text" x-model="value.location" id="location">
             </label>
 
             <label for="phone">
@@ -63,12 +63,12 @@
 
             <label for="haushalt">
                 <span>Haushaltsnetto monatlich</span>
-                <input type="number" x-model="value.haushalt" id="haushalt">
+                <input type="text" x-model="value.haushalt" id="haushalt">
             </label>
 
             <label for="einnahme">
                 <span>Netto-Mieteinnahme monatlich</span>
-                <input type="number" x-model="value.einnahme" id="einnahme">
+                <input type="text" x-model="value.einnahme" id="einnahme">
             </label>
 
             <div class="button-row">
diff --git a/views/stepper.twig.htm b/views/stepper.twig.htm
index 65d022b..2ddeb6f 100644
--- a/views/stepper.twig.htm
+++ b/views/stepper.twig.htm
@@ -40,20 +40,20 @@
                 <div class="form-container">
                     <div class="form-grid">
                         <label>Objektwert</label>
-                        <input type="number" {{cprop('value.anschluss.objektwert', 'currency') | raw}}>
+                        <input type="tel" {{cprop('value.anschluss.objektwert', 'currency') | raw}}>
                         <span class="unit">€</span>
                     </div>
                     <div class="separator"></div>
                     <div class="form-grid">
                         <label>Umschuldung</label>
-                        <input type="number" {{cprop('value.anschluss.umschuldung', 'currency') | raw}}>
+                        <input type="tel" {{cprop('value.anschluss.umschuldung', 'currency') | raw}}>
                         <span class="unit">€</span>
                         <span class="comment">Bitte geben Sie hier die Summe der gleichzeitig umzuschuldenden Darlehen an.</span>
                     </div>
                     <div class="separator"></div>
                     <div class="form-grid">
                         <label>Zusätzl. Kapital</label>
-                        <input type="number" {{cprop('value.anschluss.zuskap', 'currency') | raw}}>
+                        <input type="tel" {{cprop('value.anschluss.zuskap', 'currency') | raw}}>
                         <span  class="unit">€</span>
                     </div>
                     <div class="separator primary"></div>
diff --git a/views/vorhaben.twig.htm b/views/vorhaben.twig.htm
index 96f4d09..cf51868 100644
--- a/views/vorhaben.twig.htm
+++ b/views/vorhaben.twig.htm
@@ -4,7 +4,7 @@
     <div class="form-container">
         <div class="form-grid">
             <label>{{main.label}}</label>
-            <input type="number" {{cprop('value.' ~ kind ~ '.' ~ main.value, 'currency') | raw}}>
+            <input type="tel" {{cprop('value.' ~ kind ~ '.' ~ main.value, 'currency') | raw}}>
             <span class="unit">€</span>
         </div>
         {% if bezahlt %}
@@ -19,7 +19,7 @@
         <div class="separator"></div>
         <div class="form-grid">
             <label>{{second.label}}</label>
-            <input type="number" {{cprop('value.' ~ kind ~ '.' ~ second.value, 'currency') | raw}}>
+            <input type="tel" {{cprop('value.' ~ kind ~ '.' ~ second.value, 'currency') | raw}}>
             <span  class="unit">€</span>
         </div>
         <div class="separator"></div>
@@ -46,8 +46,8 @@
                 Makler
                 <span x-html="`${units.percent.to(parts.makler * 100)} %`"></span>
             </label>
-            <input type="number" :value="units.currency.to(value.{{kind}}.{{main.value}} * parts.makler)"
-                @focus="$event.target.value = value.{{kind}}.{{main.value}} * parts.makler"
+            <input type="tel" :value="units.currency.to(value.{{kind}}.{{main.value}} * parts.makler)"
+                @focus="$event.target.value = Math.round(value.{{kind}}.{{main.value}} * parts.makler)"
                 @blur="console.log($event); ($event.target || $event.originalTarget).value = units.currency.to(value.{{kind}}.{{main.value}} * parts.makler);"
                    @change="console.log('change'); parts.makler = units.currency.from($event.target.value) / value.{{kind}}.{{main.value}};"
             >
@@ -57,7 +57,7 @@
         <div class="separator"></div>
         <div class="form-grid">
             <label>Eigenkapital</label>
-            <input type="number" {{cprop('value.' ~ kind ~ '.eigenkapital', 'currency') | raw}}>
+            <input type="tel" {{cprop('value.' ~ kind ~ '.eigenkapital', 'currency') | raw}}>
             <span class="unit">€</span>
         </div>
         <div class="separator primary"></div>