diff --git a/src/main/resources/static/css/tooltip.css b/src/main/resources/static/css/tooltip.css
index e9f6cbd..2705778 100644
--- a/src/main/resources/static/css/tooltip.css
+++ b/src/main/resources/static/css/tooltip.css
@@ -4,6 +4,10 @@ p#tooltipText {
     height: 150px;
 }
 
+label, input, select, textarea {
+    display: block;
+}
+
 div#tooltip {
     border-radius: 15px;
     padding-left: 20px;
diff --git a/src/main/resources/templates/mock.html b/src/main/resources/templates/mock.html
index 89be034..40ab973 100644
--- a/src/main/resources/templates/mock.html
+++ b/src/main/resources/templates/mock.html
@@ -27,15 +27,15 @@
                 <div id="basicItemData" class="articleHead">Your message</div>
                 <div id="advancedItemData" class="articleHead" style="display: none;">Message id: <span id="mockedMessageId"></span></div>
                 <div id="link">
-                    <p class="label">Your link</p>
+                    <label for="messageLink">Your link</label>
                     <div id="messageLink" class="borderStyle">http://<span id="pubhost">localhost</span>:8097/klaus/v1/get/<span id="clientUuid">acc39106-f351-46bb-b81b-31b860af3e56</span>/<span id="mockedMessageResponse2">1</span></div>
                 </div>
                 <div id="msgBody">
                     <div id="typeSelection">
-                        <p class="label">Http Status</p>
+                        <label for="httpStatus">Http Status</label>
                         <textarea type="text" id="httpStatus" class="fieldDefault borderStyle"></textarea>
 
-                        <p class="label">Content Type</p>
+                        <label for="typeSelector">Content Type</label>
                         <select id="typeSelector" class="fieldDefault borderStyle">
                             <option value="application/xml">application/xml</option>
                             <option value="application/json">application/json</option>
@@ -43,7 +43,7 @@
                         </select>
                     </div>
                     <div id="bodyEdition">
-                        <p class="label">Body:</p>
+                        <label for="bodyEditor">Body:</label>
                         <textarea type="text" id="bodyEditor" class="fieldText borderStyle"></textarea>
                     </div>