diff --git a/go-form-plugin/templates/form-shortcode.php b/go-form-plugin/templates/form-shortcode.php
index 23fab79..53c45ee 100644
--- a/go-form-plugin/templates/form-shortcode.php
+++ b/go-form-plugin/templates/form-shortcode.php
@@ -49,9 +49,10 @@
     background-color: #f5f5f5;
   }
 
-  .go-form-table tr {
-    background-color: #ffffff !important;
-    border: none;
+  .go-form-grid {
+    display: grid;
+    grid-template-columns: auto auto;
+    column-gap: 16px;
   }
 </style>
 
@@ -61,49 +62,47 @@
     <input type="hidden" name="action" value="go_form_submit">
     <input type="hidden" name="form_id" value="<?php echo esc_attr($form_id); ?>">
 
-    <table class="go-form-table">
-      <tbody>
-        <tr>
-          <td>
-            <label for="first_name">First Name*:</label><input type="text" name="first_name" id="first_name" required>
-          </td>
-          <td>
-            <label for="last_name">Last Name*:</label><input type="text" name="last_name" id="last_name" required>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <button type="button" id="egd-search" class="button">Search EGD</button>
-          </td>
-          <td>
-            <label for="rank">Rank:</label>
-            <select name="rank" id="rank">
-              <?php
-              foreach ($ranks as $value => $label) {
-                echo "<option value='" . esc_attr($value) . "'>" . esc_html($label) . "</option>\n";
-              }
-              ?>
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <label for="country">Country:</label><input type="text" name="country" id="country">
-          </td>
-          <td>
-            <label for="club">Club:</label><input type="text" name="club" id="club">
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <label for="egd_number">EGD Number:</label><input type="text" name="egd_number" id="egd_number">
-          </td>
-          <td>
-            <label for="email">Email:</label><input type="email" name="email" id="email">
-          </td>
-        </tr>
-      </tbody>
-    </table>
+    <div class="go-form-grid">
+
+      <div>
+        <label for="first_name">First Name*:</label><input type="text" name="first_name" id="first_name" required>
+      </div>
+
+      <div>
+        <label for="last_name">Last Name*:</label><input type="text" name="last_name" id="last_name" required>
+      </div>
+
+      <div>
+        <button type="button" id="egd-search" class="button">Search EGD</button>
+      </div>
+
+      <div>
+        <label for="rank">Rank:</label>
+        <select name="rank" id="rank">
+          <?php
+          foreach ($ranks as $value => $label) {
+            echo "<option value='" . esc_attr($value) . "'>" . esc_html($label) . "</option>\n";
+          }
+          ?>
+        </select>
+      </div>
+
+      <div>
+        <label for="country">Country:</label><input type="text" name="country" id="country">
+      </div>
+
+      <div>
+        <label for="club">Club:</label><input type="text" name="club" id="club">
+      </div>
+
+      <div>
+        <label for="egd_number">EGD Number:</label><input type="text" name="egd_number" id="egd_number">
+      </div>
+
+      <div>
+        <label for="email">Email:</label><input type="email" name="email" id="email">
+      </div>
+    </div>
 
 
     <label for="comment">Comment</label>