diff --git a/src/servala/frontend/templates/frontend/forms/vertical_field.html b/src/servala/frontend/templates/frontend/forms/vertical_field.html
index 22562d0..a2457d9 100644
--- a/src/servala/frontend/templates/frontend/forms/vertical_field.html
+++ b/src/servala/frontend/templates/frontend/forms/vertical_field.html
@@ -1,23 +1,18 @@
 {% load i18n %}
 <div class="col-12">
-    <div class="form-group{% with classes=field.css_classes %}{% if classes %} {{ classes }}{% endif %}{% endwith %}{% if errors %} is-invalid{% endif %}">
+    <div class="form-group{% if field.field.required %} mandatory{% endif %}{% if errors %} is-invalid{% endif %}">
         {% if field.field.widget.input_type != "checkbox" or field.field.widget.allow_multiple_selected %}
-            <label for="{{ field.auto_id }}" class="{{ label_class }}">
-                {{ field.label }}
-                {% if not field.field.required %}
-                    <span class="optional">{% translate "Optional" %}</span>
-                {% endif %}
-            </label>
+            <label for="{{ field.auto_id }}" class="form-label">{{ field.label }}</label>
         {% endif %}
         {% if field.use_fieldset %}
             <fieldset {% if field.help_text and field.auto_id and "aria-describedby" not in field.field.widget.attrs %} aria-describedby="{{ field.auto_id }}_helptext"{% endif %}>
             {% endif %}
             {{ field }}
             {% if field.field.widget.input_type == "checkbox" and not field.field.widget.allow_multiple_selected %}
-                <label for="{{ field.auto_id }}">{{ field.label }}</label>
+                <label for="{{ field.auto_id }}" class="form-check-label form-label">{{ field.label }}</label>
             {% endif %}
             {% if field.use_fieldset %}</fieldset>{% endif %}
-        {% for text in field.errors %}<div class="text-danger">{{ text }}</div>{% endfor %}
+        {% for text in field.errors %}<div class="invalid-feedback">{{ text }}</div>{% endfor %}
         {% if field.help_text %}
             <small class="form-text text-muted"
                    {% if field.auto_id %}id="{{ field.auto_id }}_helptext"{% endif %}>{{ field.help_text|safe }}</small>