diff --git a/app/views/admission/rule/save.php b/app/views/admission/rule/save.php
index 16a5f7888aeb304226e6c6678f0be5985ab190ca..3611fbc7bc02cfef6ec909796e45d07fb0451572 100644
--- a/app/views/admission/rule/save.php
+++ b/app/views/admission/rule/save.php
@@ -1,16 +1,16 @@
 <div class="hover_box admissionrule" id="rule_<?= $rule->getId() ?>">
-    <span id="rule_data_<?= $rule->getId() ?>">
+    <div id="rule_data_<?= $rule->getId() ?>" class="col-3" style="margin-top: unset">
         <?= $rule->toString() ?>
         <input type="hidden" name="rules[]" value="<?= htmlReady(ObjectBuilder::exportAsJson($rule)) ?>"/>
-    </span>
-    <span class="action_icons" id="rule_actions_<?= $rule->getId() ?>">
+    </div>
+    <div class="action_icons col-1" id="rule_actions_<?= $rule->getId() ?>" style="margin-top: unset">
         <a href="#" onclick="return STUDIP.Admission.configureRule('<?= get_class($rule) ?>', '<?=
-            $controller->url_for('admission/rule/configure', get_class($rule), $rule->getId()) ?>', '<?=
-            $rule->getId() ?>')">
+        $controller->url_for('admission/rule/configure', get_class($rule), $rule->getId()) ?>', '<?=
+        $rule->getId() ?>')">
             <?= Icon::create('edit', 'clickable')->asImg(); ?></a>
-        <a href="#" onclick="return STUDIP.Dialogs.showConfirmDialog('<?= 
-                    _('Soll die Anmelderegel wirklich gelöscht werden?') ?>', 
-                    'javascript:STUDIP.Admission.removeRule(\'rule_<?= $rule->getId() ?>\', \'rules\')')">
+        <a href="#" onclick="return STUDIP.Dialogs.showConfirmDialog('<?=
+        _('Soll die Anmelderegel wirklich gelöscht werden?') ?>',
+            'javascript:STUDIP.Admission.removeRule(\'rule_<?= $rule->getId() ?>\', \'rules\')')">
             <?= Icon::create('trash', 'clickable')->asImg(); ?></a>
-    </span>
+    </div>
 </div>
diff --git a/lib/admissionrules/coursememberadmission/templates/configure.php b/lib/admissionrules/coursememberadmission/templates/configure.php
index 88560d8a32bdc17716f787ddecd686185cabad1d..68b6312bc7a77ce45309aabfba1a43e0a561aaf4 100644
--- a/lib/admissionrules/coursememberadmission/templates/configure.php
+++ b/lib/admissionrules/coursememberadmission/templates/configure.php
@@ -38,32 +38,36 @@
     <?= _('Veranstaltung suchen') ?>:
 </label>
 
-<div style="display:inline-block">
+<div style="display:flex; align-items: flex-start; column-gap: 1em; flex-wrap: wrap">
 
     <?=
     QuickSearch::get("mandatory_course_id", new SeminarSearch('number-name-lecturer'))
         ->fireJSFunctionOnSelect('addcourse')
+        ->setInputStyle('flex: 0 0 40%')
         ->render();
     ?>
-    <?= Semester::getSemesterSelector(
-        ['name' => 'search_sem_sem'],
-        Semester::getIndexById($_SESSION['_default_sem'], false, !$GLOBALS['perm']->have_perm('admin')),
-        'key',
-        false
-    )?>
-    <br><br>
+
+    <div style="flex: 0 0 40%">
+        <?= Semester::getSemesterSelector(
+            ['name' => 'search_sem_sem'],
+            Semester::getIndexById($_SESSION['_default_sem'], false, !$GLOBALS['perm']->have_perm('admin')),
+            'key',
+            false
+        )?>
+    </div>
+    <br/><br/>
     <ul>
-    <? foreach ($courses as $course) : ?>
-        <li>
-            <input type="hidden" id="<?= htmlReady($course->id) ?>"
-                   name="courses_to_add[<?= htmlReady($course->id) ?>]"
-                   value="<?= htmlReady($course->name) ?>">
-            <span><?= htmlReady($course->name) ?></span>
-            <a href="#" onclick="return removecourse('<?= htmlReady($course->id) ?>')">
-                <?= Icon::create('trash') ?>
-            </a>
-        </li>
-    <? endforeach ?>
+        <? foreach ($courses as $course) : ?>
+            <li>
+                <input type="hidden" id="<?= htmlReady($course->id) ?>"
+                       name="courses_to_add[<?= htmlReady($course->id) ?>]"
+                       value="<?= htmlReady($course->name) ?>">
+                <span><?= htmlReady($course->name) ?></span>
+                <a href="#" onclick="return removecourse('<?= htmlReady($course->id) ?>')">
+                    <?= Icon::create('trash') ?>
+                </a>
+            </li>
+        <? endforeach ?>
     </ul>
 </div>