diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
index 9dc7d393e5..d7cae6529c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
@@ -179,19 +179,21 @@
                         <h3 id="add-group-modal-label">Add group</h3>
                     </div>
                     <div class="modal-body">
-                        <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" />
-                        <input type="hidden" id="add-group-modal-action" name="action" value="add">
-
-                        <p>
-                            <label for="add-group-modal-title">Title: </label>
-                            <input type="text" name="title" id="add-group-modal-title" required="required" />
-                            <i>required</i>
-                        </p>
-
-                        <p>
-                            <label for="add-group-modal-description">Description: </label>
-                            <input type="text" name="description" id="add-group-modal-description" />
-                        </p>
+                        <fieldset class="rows">
+                            <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" />
+                            <input type="hidden" id="add-group-modal-action" name="action" value="add">
+                            <ol>
+                                <li>
+                                    <label for="add-group-modal-title">Title: </label>
+                                    <input type="text" size="40" maxlength="100" name="title" id="add-group-modal-title" required="required" />
+                                    <span class="required">Required</span>
+                                </li>
+                                <li>
+                                    <label for="add-group-modal-description">Description: </label>
+                                    <input type="text" size="40" name="description" id="add-group-modal-description" />
+                                </li>
+                            </ol>
+                        </fieldset>
                         <div id="root-group-features-add">
                             <h3>Features</h3>
                             <div class="checkbox">
@@ -231,17 +233,20 @@
                     <div class="modal-body">
                         <input type="hidden" id="edit-group-modal-id" name="id" value="" />
                         <input type="hidden" id="edit-group-modal-action" name="action" value="edit" />
+                        <fieldset class="rows">
+                            <ol>
+                                <li>
+                                    <label for="edit-group-modal-title">Title: </label>
+                                    <input type="text" size="40" maxlength="100" id="edit-group-modal-title" name="title" value="" required="required" />
+                                    <span class="required">Required</span>
+                                </li>
 
-                        <p>
-                            <label for="edit-group-modal-title">Title: </label>
-                            <input type="text" id="edit-group-modal-title" name="title" value="" required="required" />
-                            <i>required</i>
-                        </p>
-
-                        <p>
-                            <label for="edit-group-modal-description">Description: </label>
-                            <input type="text" id="edit-group-modal-description" name="description" value="" />
-                        </p>
+                                <li>
+                                    <label for="edit-group-modal-description">Description: </label>
+                                    <input type="text" size="40" id="edit-group-modal-description" name="description" value="" />
+                                </li>
+                            </ol>
+                        </fieldset>
                         <div id="root-group-features-edit">
                             <h3>Features</h3>
                             <div class="checkbox">