diff --git a/web-backend/src/main/jte/index.jte b/web-backend/src/main/jte/index.jte
index ece3db2..e3e4ea8 100644
--- a/web-backend/src/main/jte/index.jte
+++ b/web-backend/src/main/jte/index.jte
@@ -39,13 +39,12 @@
                 <!-- Two Column Grid for Tablet/Desktop -->
                 <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
 
-                    <!-- Name Field -->
                     <div class="space-y-2">
-                        <label for="name" class="block text-sm font-medium text-gray-700">
+                        <label for="name" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"/>
                             </svg>
-                            Full Name *
+                            <span class="align-middle">Full Name *</span>
                         </label>
                         <input type="text"
                                id="name"
@@ -55,13 +54,12 @@
                                placeholder="Enter your full name">
                     </div>
 
-                    <!-- Email Field -->
                     <div class="space-y-2">
-                        <label for="email" class="block text-sm font-medium text-gray-700">
+                        <label for="email" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/>
                             </svg>
-                            Email Address *
+                            <span class="align-middle">Email Address *</span>
                         </label>
                         <input type="email"
                                id="email"
@@ -71,13 +69,12 @@
                                placeholder="Enter your email address">
                     </div>
 
-                    <!-- Phone Field -->
                     <div class="space-y-2">
-                        <label for="phone" class="block text-sm font-medium text-gray-700">
+                        <label for="phone" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 5a2 2 0 012-2h3.28a1 1 0 01.948.684l1.498 4.493a1 1 0 01-.502 1.21l-2.257 1.13a11.042 11.042 0 005.516 5.516l1.13-2.257a1 1 0 011.21-.502l4.493 1.498a1 1 0 01.684.949V19a2 2 0 01-2 2h-1C9.716 21 3 14.284 3 6V5z"/>
                             </svg>
-                            Phone Number *
+                            <span class="align-middle">Phone Number *</span>
                         </label>
                         <input type="tel"
                                id="phone"
@@ -87,13 +84,12 @@
                                placeholder="Enter your phone number">
                     </div>
 
-                    <!-- Company Field -->
                     <div class="space-y-2">
-                        <label for="company" class="block text-sm font-medium text-gray-700">
+                        <label for="company" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4"/>
                             </svg>
-                            Company *
+                            <span class="align-middle">Company *</span>
                         </label>
                         <input type="text"
                                id="company"
@@ -103,13 +99,12 @@
                                placeholder="Enter your company name">
                     </div>
 
-                    <!-- Laptop Number Field -->
                     <div class="space-y-2">
-                        <label for="laptop" class="block text-sm font-medium text-gray-700">
+                        <label for="laptop" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/>
                             </svg>
-                            Laptop Number
+                            <span class="align-middle">Laptop Number</span>
                         </label>
                         <input type="text"
                                id="laptop"
@@ -118,13 +113,12 @@
                                placeholder="Enter your laptop number (optional)">
                     </div>
 
-                    <!-- Host Dropdown - Full Width -->
                     <div class="md:col-span-2 space-y-2">
-                        <label for="host-search" class="block text-sm font-medium text-gray-700">
+                        <label for="host-search" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>
                             </svg>
-                            Who are you visiting? *
+                            <span class="align-middle">Who are you visiting? *</span>
                         </label>
                         <div class="relative">
                             <input type="text"
diff --git a/web-backend/src/main/resources/templates/index-th.html b/web-backend/src/main/resources/templates/index-th.html
index 38f0dec..09d495a 100644
--- a/web-backend/src/main/resources/templates/index-th.html
+++ b/web-backend/src/main/resources/templates/index-th.html
@@ -29,11 +29,11 @@ <h1 class="text-3xl font-bold text-gray-800 mb-2">Visitor Check-in</h1>
 
                     <!-- Name Field -->
                     <div class="space-y-2">
-                        <label for="name" class="block text-sm font-medium text-gray-700">
+                        <label for="name" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"/>
                             </svg>
-                            Full Name *
+                            <span class="align-middle">Full Name *</span>
                         </label>
                         <input type="text"
                                id="name"
@@ -46,11 +46,11 @@ <h1 class="text-3xl font-bold text-gray-800 mb-2">Visitor Check-in</h1>
 
                     <!-- Email Field -->
                     <div class="space-y-2">
-                        <label for="email" class="block text-sm font-medium text-gray-700">
+                        <label for="email" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/>
                             </svg>
-                            Email Address *
+                            <span class="align-middle">Email Address *</span>
                         </label>
                         <input type="email"
                                id="email"
@@ -63,11 +63,11 @@ <h1 class="text-3xl font-bold text-gray-800 mb-2">Visitor Check-in</h1>
 
                     <!-- Phone Field -->
                     <div class="space-y-2">
-                        <label for="phone" class="block text-sm font-medium text-gray-700">
+                        <label for="phone" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 5a2 2 0 012-2h3.28a1 1 0 01.948.684l1.498 4.493a1 1 0 01-.502 1.21l-2.257 1.13a11.042 11.042 0 005.516 5.516l1.13-2.257a1 1 0 011.21-.502l4.493 1.498a1 1 0 01.684.949V19a2 2 0 01-2 2h-1C9.716 21 3 14.284 3 6V5z"/>
                             </svg>
-                            Phone Number *
+                            <span class="align-middle">Phone Number *</span>
                         </label>
                         <input type="tel"
                                id="phone"
@@ -80,11 +80,11 @@ <h1 class="text-3xl font-bold text-gray-800 mb-2">Visitor Check-in</h1>
 
                     <!-- Company Field -->
                     <div class="space-y-2">
-                        <label for="company" class="block text-sm font-medium text-gray-700">
+                        <label for="company" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4"/>
                             </svg>
-                            Company *
+                            <span class="align-middle">Company *</span>
                         </label>
                         <input type="text"
                                id="company"
@@ -95,13 +95,13 @@ <h1 class="text-3xl font-bold text-gray-800 mb-2">Visitor Check-in</h1>
                                placeholder="Enter your company name">
                     </div>
 
-                    <!-- Host Dropdown - Full Width -->
+                    <!-- Dropdown Field -->
                     <div class="md:col-span-2 space-y-2">
-                        <label for="host-search" class="block text-sm font-medium text-gray-700">
+                        <label for="host-search" class="block text-sm font-medium text-gray-700 flex items-center">
                             <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>
                             </svg>
-                            Who are you visiting? *
+                            <span class="align-middle">Who are you visiting? *</span>
                         </label>
                         <div class="relative">
                             <input type="text"
diff --git a/web-backend/src/main/resources/templates/visitor.html b/web-backend/src/main/resources/templates/visitor.html
index 9f4bcf5..4ebb6f0 100644
--- a/web-backend/src/main/resources/templates/visitor.html
+++ b/web-backend/src/main/resources/templates/visitor.html
@@ -24,79 +24,75 @@ <h1 class="text-3xl font-bold text-gray-800 mb-2">Visitor Check-in</h1>
                         
                         <!-- Name Field -->
                         <div class="space-y-2">
-                            <label for="name" class="block text-sm font-medium text-gray-700">
+                            <label for="name" class="block text-sm font-medium text-gray-700 flex items-center">
                                 <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"/>
                                 </svg>
-                                Full Name *
+                                <span class="align-middle">Full Name *</span>
                             </label>
-                            <input type="text" 
-                                   id="name" 
-                                   name="name" 
+                            <input type="text"
+                                   id="name"
+                                   name="name"
                                    required
                                    class="w-full px-4 py-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-colors"
                                    placeholder="Enter your full name">
                         </div>
 
-                        <!-- Email Field -->
                         <div class="space-y-2">
-                            <label for="email" class="block text-sm font-medium text-gray-700">
+                            <label for="email" class="block text-sm font-medium text-gray-700 flex items-center">
                                 <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/>
                                 </svg>
-                                Email Address *
+                                <span class="align-middle">Email Address *</span>
                             </label>
-                            <input type="email" 
-                                   id="email" 
-                                   name="email" 
+                            <input type="email"
+                                   id="email"
+                                   name="email"
                                    required
                                    class="w-full px-4 py-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-colors"
                                    placeholder="Enter your email address">
                         </div>
 
-                        <!-- Phone Field -->
                         <div class="space-y-2">
-                            <label for="phone" class="block text-sm font-medium text-gray-700">
+                            <label for="phone" class="block text-sm font-medium text-gray-700 flex items-center">
                                 <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 5a2 2 0 012-2h3.28a1 1 0 01.948.684l1.498 4.493a1 1 0 01-.502 1.21l-2.257 1.13a11.042 11.042 0 005.516 5.516l1.13-2.257a1 1 0 011.21-.502l4.493 1.498a1 1 0 01.684.949V19a2 2 0 01-2 2h-1C9.716 21 3 14.284 3 6V5z"/>
                                 </svg>
-                                Phone Number *
+                                <span class="align-middle">Phone Number *</span>
                             </label>
-                            <input type="tel" 
-                                   id="phone" 
+                            <input type="tel"
+                                   id="phone"
                                    name="phoneNumber"
                                    required
                                    class="w-full px-4 py-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-colors"
                                    placeholder="Enter your phone number">
                         </div>
 
-                        <!-- Company Field -->
                         <div class="space-y-2">
-                            <label for="company" class="block text-sm font-medium text-gray-700">
+                            <label for="company" class="block text-sm font-medium text-gray-700 flex items-center">
                                 <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4"/>
                                 </svg>
-                                Company *
+                                <span class="align-middle">Company *</span>
                             </label>
-                            <input type="text" 
-                                   id="company" 
-                                   name="company" 
+                            <input type="text"
+                                   id="company"
+                                   name="company"
                                    required
                                    class="w-full px-4 py-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-colors"
                                    placeholder="Enter your company name">
                         </div>
 
-                        <!-- Host Dropdown - Full Width -->
                         <div class="md:col-span-2 space-y-2">
-                            <label for="host-search" class="block text-sm font-medium text-gray-700">
+                            <label for="host-search" class="block text-sm font-medium text-gray-700 flex items-center">
                                 <svg class="inline w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>
                                 </svg>
-                                Who are you visiting? *
+                                <span class="align-middle">Who are you visiting? *</span>
                             </label>
                             <div class="relative">
-                                <input type="text" 
-                                       id="host-search" 
+                                <input type="text"
+                                       id="host-search"
                                        name="hostSearch"
                                        autocomplete="off"
                                        class="w-full px-4 py-3 pr-10 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-colors"