diff --git a/templates/forum_conversation/partials/topic_form.html b/templates/forum_conversation/partials/topic_form.html
index fd20dd33..7840a3e2 100644
--- a/templates/forum_conversation/partials/topic_form.html
+++ b/templates/forum_conversation/partials/topic_form.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<form method="post" action="." class="form" enctype="multipart/form-data" novalidate>{% csrf_token %}
+<form method="post" action="." class="form space-y-4" enctype="multipart/form-data" novalidate>{% csrf_token %}
   {% for error in post_form.non_field_errors %}
   <div class="alert alert-danger">
     <i class="icon-exclamation-sign"></i> {{ error }}
@@ -60,8 +60,8 @@
       <div class="form-group">
         <br />
         {% if poll_options_validated and poll_option_formset.non_form_errors %}<div class="alert alert-danger">{{ poll_option_formset.non_form_errors|striptags }}</div>{% endif %}
-        <div class="row">
-          <div class="col-md-6">
+        <div class="w-full flex space-x-4">
+          <div class="w-1/2 space-y-4">
             {% include "partials/form_field.html" with field=post_form.poll_question %}
             {% include "partials/form_field.html" with field=post_form.poll_max_options %}
             {% include "partials/form_field.html" with field=post_form.poll_duration %}
@@ -74,7 +74,7 @@
               </div>
             </div>
           </div>
-          <div id="poll_formset" class="col-md-6">
+          <div id="poll_formset" class="w-1/2 space-y-4">
             {% include "forum_conversation/forum_polls/poll_option_formset.html" %}
           </div>
         </div>
diff --git a/templates/forum_conversation/post_create.html b/templates/forum_conversation/post_create.html
index 0fa9e12f..8afb9311 100644
--- a/templates/forum_conversation/post_create.html
+++ b/templates/forum_conversation/post_create.html
@@ -21,7 +21,7 @@
         <h3 class="m-0 h5 card-title text-base">{% trans "Post a reply" %}</h3>
       </div>
       <div class="card-body p-4">
-        <form method="post" action="." class="form" enctype="multipart/form-data" novalidate>{% csrf_token %}
+        <form method="post" action="." class="form space-y-4" enctype="multipart/form-data" novalidate>{% csrf_token %}
           {% include "forum_conversation/partials/post_form.html" %}
           <div class="form-actions my-5">
             <input type="submit" name="preview" class="px-8 py-3 border border-slate text-base font-medium rounded-md text-orange md:py-1 md:text-lg md:px-4 uppercase text-sm" value="{% trans "Preview" %}" />&nbsp;