diff --git a/components/02_Molecules/form/form.hbs b/components/02_Molecules/form/form.hbs
index 12b7946..239cc78 100644
--- a/components/02_Molecules/form/form.hbs
+++ b/components/02_Molecules/form/form.hbs
@@ -3,44 +3,48 @@
         <legend class="LP-Form__Legend">Basic data</legend>
 
         <div class="LP-Form__Composition LP-Form__Composition--breakable">
-            <span class="LP-Form__Field LP-Input LP-Input--error">
-                <label for="input123" class="LP-Input__Label">First name</label>
-                <input type="text" id="input123" class="LP-Input__Field"/>
-                <span class="LP-Input__Message">Field is required</span>
-            </span>
-            <span class="LP-Form__Field LP-Input">
-                <label for="input123" class="LP-Input__Label">Last name</label>
-                <input type="text" id="input123" class="LP-Input__Field"/>
-            </span>
+            <div class="LP-Form__Field">
+				<div class="LP-Input LP-Input--error">
+					<label for="input123" class="LP-Input__Label">First name</label>
+					<input type="text" id="input123" class="LP-Input__Field" placeholder="Peter"/>
+					<span class="LP-Input__Message">Field is required</span>
+				</div>
+            </div>
+            <div class="LP-Form__Field">
+				<div class="LP-Input">
+                	<label for="input123" class="LP-Input__Label">Last name</label>
+                	<input type="text" id="input123" class="LP-Input__Field"/>
+				</div>
+            </div>
         </div>
 
         <div class="LP-Form__Composition">
-            <span class="LP-Form__Field LP-Form__Field--wider LP-Input">
+            <div class="LP-Form__Field LP-Form__Field--wider LP-Input">
                 <label for="input123" class="LP-Input__Label">Street</label>
                 <input type="text" id="input123" class="LP-Input__Field"/>
                 <span class="LP-Input__Message">We won't send any stalkers, promise</span>
-            </span>
-            <span class="LP-Form__Field LP-Form__Field--narrower LP-Input">
+            </div>
+            <div class="LP-Form__Field LP-Form__Field--narrower LP-Input">
                 <label for="input123" class="LP-Input__Label">House no</label>
                 <input type="text" id="input123" class="LP-Input__Field"/>
                 <span class="LP-Input__Message">Field is required</span>
-            </span>
-            <span class="LP-Form__Field LP-Form__Field--narrower LP-Input">
+            </div>
+            <div class="LP-Form__Field LP-Form__Field--narrower LP-Input LP-Input--disabled">
                 <label for="input123" class="LP-Input__Label">Disabled</label>
                 <input type="text" id="input123" class="LP-Input__Field" disabled="disabled"/>
                 <span class="LP-Input__Message">Field is required</span>
-            </span>
+            </div>
         </div>
 
         <div class="LP-Form__Composition">
-            <span class="LP-Form__Field LP-Form__Field--narrow LP-Input">
+            <div class="LP-Form__Field LP-Form__Field--narrow LP-Input">
                 <label for="input123" class="LP-Input__Label">Postal Code</label>
                 <input type="text" id="input123" class="LP-Input__Field"/>
-            </span>
-            <span class="LP-Form__Field LP-Form__Field--wide LP-Input">
+            </div>
+            <div class="LP-Form__Field LP-Form__Field--wide LP-Input">
                 <label for="input123" class="LP-Input__Label">Town</label>
                 <input type="text" id="input123" class="LP-Input__Field"/>
-            </span>
+            </div>
         </div>
 
     </fieldset>