diff --git a/app/assets/javascripts/lectures.coffee b/app/assets/javascripts/lectures.coffee
index 6e8d60759..3f588c467 100644
--- a/app/assets/javascripts/lectures.coffee
+++ b/app/assets/javascripts/lectures.coffee
@@ -9,6 +9,17 @@ disableExceptOrganizational = ->
   $('[data-bs-toggle="collapse"]').prop('disabled', true).removeClass('clickable')
   return
 
+# Load example data (erdbeere) for structures
+loadExampleStructures = ->
+  structuresBody = $('#erdbeereStructuresBody')
+  lectureId = structuresBody.data('lecture')
+  loading = structuresBody.data('loading')
+  structuresBody.empty().append(loading)
+  $.ajax Routes.edit_structures_path(lectureId),
+    type: 'GET'
+    dataType: 'script'
+  return
+
 $(document).on 'turbolinks:load', ->
   initBootstrapPopovers()
   # if any input is given to the lecture form (for people in lecture),
@@ -282,14 +293,7 @@ $(document).on 'turbolinks:load', ->
       largeDisplay()
     return
 
-  $('#erdbeere_structures_heading').on 'click', ->
-    lectureId = $(this).data('lecture')
-    loading = $(this).data('loading')
-    $('#erdbeereStructuresBody').empty().append(loading)
-    $.ajax Routes.edit_structures_path(lectureId),
-      type: 'GET'
-      dataType: 'script'
-    return
+  loadExampleStructures()
 
   $lectureStructures = $('#lectureStructuresInfo')
   if $lectureStructures.length > 0
diff --git a/app/assets/stylesheets/lectures.scss b/app/assets/stylesheets/lectures.scss
index 6e31dd03d..64735889e 100644
--- a/app/assets/stylesheets/lectures.scss
+++ b/app/assets/stylesheets/lectures.scss
@@ -73,4 +73,35 @@
   &:hover {
     color: white !important;
   }
+}
+
+#lecture-nav-pills {
+  background-color: white;
+  justify-content: center;
+  padding-top: 1em;
+  padding-bottom: 1em;
+
+  box-shadow: 0px 2px 7px 0rem rgba(130,26,59,0.2);
+  border: #821A3B solid 1px;
+  border-radius: 0.4em;
+  margin-bottom: 1.5em;
+}
+
+.lecture-nav-pill-button {
+  --bs-nav-link-color: #821A3B;
+  --bs-nav-link-hover-color: #8d1c40;
+  --bs-nav-pills-link-active-bg: #821A3B;
+
+  &:focus-visible {
+    box-shadow: 0 0 0 0.25rem rgba(130, 26, 59, 0.25);
+  }
+}
+
+
+.lecture-pane {
+  background-color: white;
+  padding: 1.5em 1em;
+  box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2);
+  border: gray 1px solid;
+  border-radius: 0.4em;
 }
\ No newline at end of file
diff --git a/app/views/lectures/edit/_announcements.html.erb b/app/views/lectures/edit/_announcements.html.erb
index 5d14d926e..63261f27f 100644
--- a/app/views/lectures/edit/_announcements.html.erb
+++ b/app/views/lectures/edit/_announcements.html.erb
@@ -1,44 +1,15 @@
-  <div class="accordion-item bg-light">
-    <div class="accordion-header">
-      <button class="accordion-button collapsed"
-              type="button"
-              id="announcements_heading"
-              data-bs-toggle="collapse"
-              data-bs-target="#announcements_collapse"
-              aria-expanded="false"
-              aria-controls="announcements_collapse">
-        <div class="row">
-          <div class="col-12">
-            <h5>
-              <%= t('categories.announcements') %>
-              (<%= lecture.announcements.size %>)
-            </h5>
-          </div>
-        </div>
-      </button>
-    </div>
-    <div id="announcements_collapse"
-         class="collapse"
-         role="tabpanel"
-         aria-labelledby="heading"
-         data-bs-parent="#lectureAccordion">
-      <div class="accordion-body">
-        <div class="row mb-2">
-          <div class="col-12 text-center">
-            <%= link_to t('buttons.create_announcement'),
-                        new_announcement_path(params: { lecture: lecture.id }),
-                        class: 'btn btn-sm btn-secondary',
-                        id: 'new-announcement-button',
-                        remote: true %>
-          </div>
-        </div>
-        <% announcements.each do |a| %>
-          <div class="row border-bottom mx-2 px-4 py-2"
-               id="row-announcement-<%= a.id %>">
-            <%= render partial: 'announcements/row_for_lecture_edit',
-                       locals: { announcement: a }%>
-          </div>
-        <% end %>
-      </div>
-    </div>
+<div class="col-12 text-center">
+  <%= link_to t('buttons.create_announcement'),
+              new_announcement_path(params: { lecture: lecture.id }),
+              class: 'btn btn-sm btn-secondary',
+              id: 'new-announcement-button',
+              remote: true %>
+</div>
+
+<% announcements.each do |a| %>
+  <div class="row border-bottom mx-2 px-4 py-2"
+        id="row-announcement-<%= a.id %>">
+    <%= render partial: 'announcements/row_for_lecture_edit',
+                locals: { announcement: a }%>
   </div>
+<% end %>
diff --git a/app/views/lectures/edit/_assignments.html.erb b/app/views/lectures/edit/_assignments.html.erb
index 2bdea32f3..83c0391f8 100644
--- a/app/views/lectures/edit/_assignments.html.erb
+++ b/app/views/lectures/edit/_assignments.html.erb
@@ -1,120 +1,94 @@
-<div class="accordion-item bg-light">
-  <div class="accordion-header">
-    <button class="accordion-button collapsed"
-            type="button"
-            id="assignments_heading"
-            data-bs-toggle="collapse"
-            data-bs-target="#assignments_collapse"
-            aria-expanded="false"
-            aria-controls="assignments_collapse">
-      <div class="row">
-        <div class="col-12">
-          <h5>
-            <%= t('basics.assignments') %>
-          </h5>
-        </div>
-      </div>
-    </button>
+<div class="row mb-3">
+  <div class="col-12 text-center">
+    <%= link_to t('admin.assignment.new'),
+                new_assignment_path(params: { lecture_id: lecture.id }),
+                class: 'btn btn-sm btn-primary',
+                id: 'newAssignmentButton',
+                remote: true %>
   </div>
-  <div id="assignments_collapse"
-       class="collapse"
-       role="tabpanel"
-       aria-labelledby="heading"
-       data-bs-parent="#lectureAccordion">
-    <div class="accordion-body">
-      <div class="row mb-3">
-        <div class="col-12 text-center">
-          <%= link_to t('admin.assignment.new'),
-                      new_assignment_path(params: { lecture_id: lecture.id }),
-                      class: 'btn btn-sm btn-primary',
-                      id: 'newAssignmentButton',
-                      remote: true %>
-        </div>
+</div>
+<div class="list-group">
+  <div class="list-group-item bg-light"
+        id="assignmentListHeader"
+        style="display: <%= show(lecture.assignments?) %>">
+    <div class="row">
+      <div class="col-2">
+        <h6>
+          <%= t('basics.title') %>
+        </h6>
+      </div>
+      <div class="col-3">
+        <h6>
+          <%= t('basics.deadline') %>
+        </h6>
+      </div>
+      <div class="col-2">
+        <h6>
+          <%= t('basics.medium') %>
+        </h6>
+      </div>
+      <div class="col-2">
+        <h6>
+          <%= t('submission.file_format') %>
+        </h6>
+      </div>
+      <div class="col-2">
+        <h6>
+          <%= t('assignment.deletion_date') %>
+        </h6>
       </div>
-      <div class="list-group">
-        <div class="list-group-item bg-light"
-             id="assignmentListHeader"
-             style="display: <%= show(lecture.assignments?) %>">
-          <div class="row">
-            <div class="col-2">
-              <h6>
-                <%= t('basics.title') %>
-              </h6>
-            </div>
-            <div class="col-3">
-              <h6>
-                <%= t('basics.deadline') %>
-              </h6>
-            </div>
-            <div class="col-2">
-              <h6>
-                <%= t('basics.medium') %>
-              </h6>
-            </div>
-            <div class="col-2">
-              <h6>
-                <%= t('submission.file_format') %>
-              </h6>
-            </div>
-            <div class="col-2">
-              <h6>
-                <%= t('assignment.deletion_date') %>
-              </h6>
-            </div>
-            <div class="col-1">
-              <h6>
-                <%= t('basics.action') %>
-                <%= helpdesk(t('assignment.destruction_info'), true) %>
-              </h6>
-            </div>
-          </div>
-        </div>
-        <% (lecture.scheduled_assignments.sort_by(&:deadline).reverse +
-            lecture.assignments.order('deadline DESC')).each do |a| %>
-          <%= render partial: 'assignments/row',
-                     locals: { assignment: a } %>
-        <% end %>
+      <div class="col-1">
+        <h6>
+          <%= t('basics.action') %>
+          <%= helpdesk(t('assignment.destruction_info'), true) %>
+        </h6>
       </div>
-      <%= form_with model: lecture,
-                    html: { id: 'lecture-assignments-form',
-                            class: 'mt-4 px-2' } do |f| %>
-        <div class="row">
-          <div class="mb-3 col-md-6">
-            <%= f.label :submission_max_team_size,
-                        t('admin.lecture.submission_max_team_size'),
-                        class: "form-label" %>
-            <%= helpdesk t('admin.lecture.info.submission_max_team_size'),
-                         false %>
-            <%= f.number_field :submission_max_team_size,
-                               min: 1,
-                               max: 10000,
-                               class: 'form-control mx-2',
-                               data:
-                                { value: lecture.submission_max_team_size } %>
-          </div>
-          <div class="mb-3 col-md-6">
-            <%= f.label :submission_grace_period,
-                        t('admin.lecture.submission_grace_period'),
-                        class: "form-label" %>
-            <%= helpdesk t('admin.lecture.info.submission_grace_period'),
-                         false %>
-            <%= f.number_field :submission_grace_period,
-                               min: 0,
-                               max: 262800,
-                               class: 'form-control mx-2',
-                               data: { value: lecture.submission_grace_period } %>
-          </div>
-        </div>
-        <div id="lecture-assignments-warning" class="mt-3">
-          <%= t('warnings.unsaved_changes') %>
-          <%= f.submit t('buttons.save_and_exit'),
-                       class: "btn btn-sm btn-primary" %>
-          <button type="button" id="cancel-lecture-assignments"
-                  class="btn btn-sm btn-secondary">
-            <%= t('buttons.cancel') %>
-          </button>
-        </div>
-      <% end %>
     </div>
   </div>
-</div>
\ No newline at end of file
+  <% (lecture.scheduled_assignments.sort_by(&:deadline).reverse +
+      lecture.assignments.order('deadline DESC')).each do |a| %>
+    <%= render partial: 'assignments/row',
+                locals: { assignment: a } %>
+  <% end %>
+</div>
+
+<%= form_with model: lecture,
+              html: { id: 'lecture-assignments-form',
+                      class: 'mt-4 px-2' } do |f| %>
+  <div class="row">
+    <div class="mb-3 col-md-6">
+      <%= f.label :submission_max_team_size,
+                  t('admin.lecture.submission_max_team_size'),
+                  class: "form-label" %>
+      <%= helpdesk t('admin.lecture.info.submission_max_team_size'),
+                    false %>
+      <%= f.number_field :submission_max_team_size,
+                          min: 1,
+                          max: 10000,
+                          class: 'form-control mx-2',
+                          data:
+                          { value: lecture.submission_max_team_size } %>
+    </div>
+    <div class="mb-3 col-md-6">
+      <%= f.label :submission_grace_period,
+                  t('admin.lecture.submission_grace_period'),
+                  class: "form-label" %>
+      <%= helpdesk t('admin.lecture.info.submission_grace_period'),
+                    false %>
+      <%= f.number_field :submission_grace_period,
+                          min: 0,
+                          max: 262800,
+                          class: 'form-control mx-2',
+                          data: { value: lecture.submission_grace_period } %>
+    </div>
+  </div>
+  <div id="lecture-assignments-warning" class="mt-3">
+    <%= t('warnings.unsaved_changes') %>
+    <%= f.submit t('buttons.save_and_exit'),
+                  class: "btn btn-sm btn-primary" %>
+    <button type="button" id="cancel-lecture-assignments"
+            class="btn btn-sm btn-secondary">
+      <%= t('buttons.cancel') %>
+    </button>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/lectures/edit/_comments.html.erb b/app/views/lectures/edit/_comments.html.erb
index cdc6345c5..618fcee68 100644
--- a/app/views/lectures/edit/_comments.html.erb
+++ b/app/views/lectures/edit/_comments.html.erb
@@ -1,103 +1,77 @@
-<div class="accordion-item bg-light">
-  <div class="accordion-header">
-    <button class="accordion-button collapsed"
-            type="button"
-            id="comments_heading"
-            data-bs-toggle="collapse"
-            data-bs-target="#comments_collapse"
-            aria-expanded="false"
-            aria-controls="comments_collapse">
-      <div class="row">
-        <div class="col-12">
-          <h5>
-            <%= t('categories.comments') %>
-          </h5>
-        </div>
-      </div>
-    </button>
+<div class="row">
+  <div class="col-12 text-center" id="comments-buttons">
+    <%= link_to t('buttons.close_comments'),
+                lecture_close_comments_path(lecture),
+                class: 'btn btn-sm btn-primary' %>
+    <%= link_to t('buttons.open_comments'),
+                lecture_open_comments_path(lecture),
+                class: 'btn btn-sm btn-primary' %>
+  </div>
+</div>
+
+<%= form_with model: lecture,
+            html: { id: 'lecture-comments-form' } do |f| %>
+  <div class="row my-3 ms-2">
+    <div class="form-check">
+      <%= f.check_box :comments_disabled,
+                      class: 'form-check-input' %>
+      <%= f.label :comments_disabled,
+                  t('admin.lecture.comments_disabled'),
+                  { class: 'form-check-label' } %>
+      <%= helpdesk(t('admin.lecture.info.comments_disabled'),
+                false) %>
+    </div>
   </div>
-  <div id="comments_collapse"
-        class="collapse"
-        role="tabpanel"
-        aria-labelledby="heading"
-        data-bs-parent="#lectureAccordion">
-    <div class="accordion-body">
-      <div class="row">
-        <div class="col-12 text-center" id="comments-buttons">
-          <%= link_to t('buttons.close_comments'),
-                      lecture_close_comments_path(lecture),
-                      class: 'btn btn-sm btn-primary' %>
-          <%= link_to t('buttons.open_comments'),
-                      lecture_open_comments_path(lecture),
-                      class: 'btn btn-sm btn-primary' %>
+  <div class="row">
+    <div class="col-12 text-center">
+      <div id="lecture-comments-warning">
+        <%= t('warnings.unsaved_changes') %>
+        <%= f.submit t('buttons.save_and_exit'),
+                      class: "btn btn-sm btn-primary" %>
+        <button type="button" id="cancel-lecture-comments"
+                class="btn btn-sm btn-secondary">
+          <%= t('buttons.cancel') %>
+        </button>
+      </div>
+    </div>
+    <!--- ANNOTATION BUTTON -->
+    <div class="form-group">
+      <%= t('admin.lecture.enable_annotation_button') %>
+      <%= helpdesk(t('admin.lecture.enable_annotation_button_helpdesk'),
+                    false) %>
+      <div class="form-row ml-2">
+        <div class="form-check form-check-inline">
+          <%= f.radio_button :annotations_status,
+                              1,
+                              class: 'form-check-input' %>
+          <%= f.label :annotations_status,
+                      t('basics.yes_lc'),
+                      value: 1,
+                      class: 'form-check-label' %>
+        </div>
+        <div class="form-check form-check-inline">
+          <%= f.radio_button :annotations_status,
+                              -1,
+                              class: 'form-check-input' %>
+          <%= f.label :annotations_status,
+                      t('basics.no_lc'),
+                      value: -1,
+                      class: 'form-check-label' %>
         </div>
       </div>
-      <%= form_with model: lecture,
-                    html: { id: 'lecture-comments-form' } do |f| %>
-        <div class="row my-3 ms-2">
-          <div class="form-check">
-            <%= f.check_box :comments_disabled,
-                            class: 'form-check-input' %>
-            <%= f.label :comments_disabled,
-                        t('admin.lecture.comments_disabled'),
-                        { class: 'form-check-label' } %>
-            <%= helpdesk(t('admin.lecture.info.comments_disabled'),
-                      false) %>
-          </div>
+    </div>
+    <div class="row">
+      <div class="col-12 text-center">
+        <div id="lecture-comments-warning">
+          <%= t('warnings.unsaved_changes') %>
+          <%= f.submit t('buttons.save_and_exit'),
+                        class: "btn btn-sm btn-primary" %>
+          <button type="button" id="cancel-lecture-comments"
+                  class="btn btn-sm btn-secondary">
+            <%= t('buttons.cancel') %>
+          </button>
         </div>
-        <div class="row">
-          <div class="col-12 text-center">
-            <div id="lecture-comments-warning">
-              <%= t('warnings.unsaved_changes') %>
-              <%= f.submit t('buttons.save_and_exit'),
-                            class: "btn btn-sm btn-primary" %>
-              <button type="button" id="cancel-lecture-comments"
-                      class="btn btn-sm btn-secondary">
-                <%= t('buttons.cancel') %>
-              </button>
-            </div>
-          </div>
-          <!--- ANNOTATION BUTTON -->
-          <div class="form-group">
-            <%= t('admin.lecture.enable_annotation_button') %>
-            <%= helpdesk(t('admin.lecture.enable_annotation_button_helpdesk'),
-                         false) %>
-            <div class="form-row ml-2">
-              <div class="form-check form-check-inline">
-                <%= f.radio_button :annotations_status,
-                                   1,
-                                   class: 'form-check-input' %>
-                <%= f.label :annotations_status,
-                            t('basics.yes_lc'),
-                            value: 1,
-                            class: 'form-check-label' %>
-              </div>
-              <div class="form-check form-check-inline">
-                <%= f.radio_button :annotations_status,
-                                   -1,
-                                   class: 'form-check-input' %>
-                <%= f.label :annotations_status,
-                            t('basics.no_lc'),
-                            value: -1,
-                            class: 'form-check-label' %>
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-12 text-center">
-              <div id="lecture-comments-warning">
-                <%= t('warnings.unsaved_changes') %>
-                <%= f.submit t('buttons.save_and_exit'),
-                             class: "btn btn-sm btn-primary" %>
-                <button type="button" id="cancel-lecture-comments"
-                        class="btn btn-sm btn-secondary">
-                  <%= t('buttons.cancel') %>
-                </button>
-              </div>
-            </div>
-          </div>
-        <% end %>
       </div>
     </div>
   </div>
-</div>
+<% end %>
diff --git a/app/views/lectures/edit/_erdbeere.html.erb b/app/views/lectures/edit/_erdbeere.html.erb
index b7a1267e8..a158a44db 100644
--- a/app/views/lectures/edit/_erdbeere.html.erb
+++ b/app/views/lectures/edit/_erdbeere.html.erb
@@ -1,29 +1,4 @@
-<div class="accordion-item bg-light">
-  <div class="accordion-header">
-    <button class="accordion-button collapsed"
-            type="button"
-            id="erdbeere_structures_heading"
-            data-bs-toggle="collapse"
-            data-bs-target="#erdbeere_structures_collapse"
-            aria-expanded="false"
-            data-loading="<%= t('basics.loading_data') %>"
-            data-lecture="<%= lecture.id %>"
-            aria-controls="erdbeere_structures_collapse">
-      <div class="row">
-        <div class="col-12">
-          <h5 id="erdbeereStructures" >
-            <%= t('categories.erdbeere.singular') %>
-          </h5>
-        </div>
-      </div>
-    </button>
-  </div>
-    <div id="erdbeere_structures_collapse"
-         class="collapse"
-         role="tabpanel"
-         aria-labelledby="heading"
-         data-bs-parent="#lectureAccordion">
-      <div class="accordion-body" id="erdbeereStructuresBody">
-      </div>
-    </div>
-</div>
\ No newline at end of file
+<div class="accordion-body" id="erdbeereStructuresBody"
+    data-lecture="<%= lecture.id %>"
+    data-loading="<%= t('basics.loading_data') %>">
+</div>
diff --git a/app/views/lectures/edit/_form.html.erb b/app/views/lectures/edit/_form.html.erb
index e0f17c223..c08624472 100644
--- a/app/views/lectures/edit/_form.html.erb
+++ b/app/views/lectures/edit/_form.html.erb
@@ -1,63 +1,164 @@
 <% cache lecture do %>
   <div id="lecture-area">
-    <%= render partial: 'lectures/edit/header',
-               locals: { lecture: lecture } %>
-    <div class="row px-4 py-2">
-      <% if !lecture.seminar? || lecture.legacy_seminar %>
-        <div id="lecture-content-card" class="col-12 col-xxl-9 mb-1">
-          <%= render partial: 'lectures/edit/content',
-                     locals: { lecture: lecture } %>
+    <!-- Header -->
+    <div class="container small-width">
+      <%= render partial: 'lectures/edit/header',
+          locals: { lecture: lecture } %>
+    </div>
+    
+    <!-- Menu to switch between "tabs" ("pillars") -->
+    <nav>
+      <div class="nav nav-pills container small-width flex-column flex-sm-row"
+          id="lecture-nav-pills" role="tablist">
+        <button class="nav-link active lecture-nav-pill-button"
+            id="lecture-nav-content" type="button" role="tab"
+            data-bs-toggle="pill" data-bs-target="#lecture-pane-content"
+            aria-controls="lecture-pane-content" aria-selected="true">
+          <!-- TODO (Lectures): Localize -->
+          Content
+        </button>
+        <button class="nav-link lecture-nav-pill-button"
+            id="lecture-nav-settings" type="button" role="tab"
+            data-bs-toggle="pill" data-bs-target="#lecture-pane-settings"
+            aria-controls="lecture-pane-settings" aria-selected="false">
+          Settings
+        </button>
+        <button class="nav-link lecture-nav-pill-button"
+            id="lecture-nav-people" type="button" role="tab"
+            data-bs-toggle="pill" data-bs-target="#lecture-pane-people"
+            aria-controls="lecture-pane-people" aria-selected="false">
+          People/Tuts
+        </button>
+        <button class="nav-link lecture-nav-pill-button"
+            id="lecture-nav-orga" type="button" role="tab"
+            data-bs-toggle="pill" data-bs-target="#lecture-pane-orga"
+            aria-controls="lecture-pane-orga" aria-selected="false">
+          Orga
+        </button>
+        <button class="nav-link lecture-nav-pill-button"
+            id="lecture-nav-communication" type="button" role="tab"
+            data-bs-toggle="pill" data-bs-target="#lecture-pane-communication"
+            aria-controls="lecture-pane-communication" aria-selected="false">
+          Communication
+        </button>
+        <button class="nav-link lecture-nav-pill-button"
+            id="lecture-nav-homework" type="button" role="tab"
+            data-bs-toggle="pill" data-bs-target="#lecture-pane-homework"
+            aria-controls="lecture-pane-homework" aria-selected="false">
+          Homework
+        </button>
+        <button class="nav-link lecture-nav-pill-button"
+          id="lecture-nav-info" role="link" type="button" role="tab"
+          data-bs-toggle="pill" data-bs-target="#lecture-pane-info"
+          aria-controls="lecture-pane-info" aria-selected="false">
+          Info
+        </button>
+      </div>
+    </nav>
+
+    <div class="tab-content">
+      <!-- Content (structure & media) -->
+      <div class="tab-pane fade show active" id="lecture-pane-content"
+          role="tabpanel" aria-labelledby="lecture-nav-content" tabindex="0">
+        <div class="row px-4 py-2">
+          <% if !lecture.seminar? || lecture.legacy_seminar %>
+            <div id="lecture-content-card" class="col-12 col-xxl-9 mb-1">
+              <%= render partial: 'lectures/edit/content',
+                  locals: { lecture: lecture } %>
+            </div>
+          <% else %>
+            <div id="lecture-content-card" class="col-12 col-xxl-9 mb-1">
+              <%= render partial: 'lectures/edit/seminar_content',
+                  locals: { lecture: lecture } %>
+            </div>
+          <% end %>
+          <div id="lecture-media-card" class="col-12 col-xxl-3 mb-1">
+            <%= render partial: 'lectures/edit/media',
+                locals: { media: media, lecture: lecture } %>
+          </div>
         </div>
-      <% else %>
-        <div id="lecture-content-card" class="col-12 col-xxl-9 mb-1">
-          <%= render partial: 'lectures/edit/seminar_content',
-                     locals: { lecture: lecture } %>
+      </div>
+      
+      <!-- Settings -->
+      <div class="tab-pane fade" id="lecture-pane-settings"
+          role="tabpanel" aria-labelledby="lecture-nav-settings" tabindex="0">
+        <div class="container small-width lecture-pane">
+          <%= render partial: 'lectures/edit/preferences',
+              locals: { lecture: lecture } %>
         </div>
-      <% end %>
-      <div id="lecture-media-card" class="col-12 col-xxl-3 mb-1">
-        <%= render partial: 'lectures/edit/media',
-                   locals: { media: media,
-                             lecture: lecture } %>
       </div>
-    </div>
-    <div class="row px-4 py-2 mt-3">
-      <div class="accordion col-12" id="lectureAccordion">
-        <%= render partial: 'lectures/edit/tags',
-                   locals: { lecture: lecture } %>
-        <%= render partial: 'lectures/edit/imported_media',
-                   locals: { lecture: lecture } %>
-        <%= render partial: 'lectures/edit/erdbeere',
-                   locals: { lecture: lecture } %>
-        <%= render partial: 'lectures/edit/people',
-                   locals: { lecture: lecture } %>
-        <%= render partial: 'lectures/edit/organizational_concept',
-                   locals: { lecture: lecture } %>
-        <%= render partial: 'lectures/edit/tutorials',
-                   locals: { lecture: lecture } %>
-        <%= render partial: 'lectures/edit/assignments',
-                   locals: { lecture: lecture } %>
-        <%= render partial: 'lectures/edit/announcements',
-                   locals: { lecture: lecture,
-                             announcements: announcements } %>
-        <%= render partial: 'lectures/edit/forum',
-                   locals: { lecture: lecture } %>
-        <%= render partial: 'lectures/edit/comments',
-                   locals: { lecture: lecture } %>
-        <%= render partial: 'lectures/edit/preferences',
-                   locals: { lecture: lecture } %>
+
+      <!-- People -->
+      <div class="tab-pane fade" id="lecture-pane-people"
+          role="tabpanel" aria-labelledby="lecture-nav-people" tabindex="0">
+        <div class="container small-width lecture-pane">
+          <%= render partial: 'lectures/edit/people',
+              locals: { lecture: lecture } %>
+          <%= render partial: 'lectures/edit/tutorials',
+              locals: { lecture: lecture } %>
+        </div>
+      </div>
+
+      <!-- Organisation -->
+      <div class="tab-pane fade" id="lecture-pane-orga"
+          role="tabpanel" aria-labelledby="lecture-nav-orga" tabindex="0">
+        <div class="container small-width lecture-pane">
+          <%= render partial: 'lectures/edit/organizational_concept',
+              locals: { lecture: lecture } %>
+        </div>
+      </div>
+
+      <!-- Communication -->
+      <div class="tab-pane fade" id="lecture-pane-communication"
+          role="tabpanel" aria-labelledby="lecture-nav-communication" tabindex="0">
+        <div class="container small-width lecture-pane">
+          <%= render partial: 'lectures/edit/announcements',
+              locals: { lecture: lecture, announcements: announcements } %>
+          <%= render partial: 'lectures/edit/forum',
+              locals: { lecture: lecture } %>
+          <%= render partial: 'lectures/edit/comments',
+              locals: { lecture: lecture } %>
+        </div>
+      </div>
+
+      <!-- Homework -->
+      <div class="tab-pane fade" id="lecture-pane-homework"
+          role="tabpanel" aria-labelledby="lecture-nav-homework" tabindex="0">
+        <div class="container small-width lecture-pane">
+          <%= render partial: 'lectures/edit/assignments',
+              locals: { lecture: lecture } %>
+        </div>
+      </div>
+
+      <!-- Info -->
+      <div class="tab-pane fade" id="lecture-pane-info"
+          role="tabpanel" aria-labelledby="lecture-nav-info" tabindex="0">
+        <div class="container small-width lecture-pane">
+          <%= render partial: 'lectures/edit/tags',
+              locals: { lecture: lecture } %>
+          <%= render partial: 'lectures/edit/imported_media',
+              locals: { lecture: lecture } %>
+          <%= render partial: 'lectures/edit/erdbeere',
+              locals: { lecture: lecture } %>
+        </div>
       </div>
     </div>
   </div>
+
+
+  <!-- TODO (Lectures): Find out when these partials are used -->
   <%= render partial: 'media/modal' %>
   <%= render partial: 'sections/content_modal' %>
   <%= render partial: 'tags/modal' %>
   <%= render partial: 'announcements/modal' %>
   <%= render partial: 'lectures/publish/publish',
              locals: { lecture: lecture } %>
+   
   <% unless lecture.stale? %>
     <%= render partial: 'lectures/edit/user_modal',
                locals: { lecture: lecture } %>
   <% end %>
+
   <% if !lecture.seminar? || lecture.legacy_seminar %>
     <%= render partial: 'chapters/modal',
                locals: { lecture: lecture } %>
@@ -67,8 +168,10 @@
     <%= render partial: 'talks/modal',
                locals: { lecture: lecture } %>
   <% end %>
+
   <% if lecture.importable_toc? %>
     <%= render partial: 'lectures/edit/import_toc_modal',
               locals: { lecture: lecture } %>
   <% end %>
+
 <% end %>
diff --git a/app/views/lectures/edit/_forum.html.erb b/app/views/lectures/edit/_forum.html.erb
index 837854fb9..470289d32 100644
--- a/app/views/lectures/edit/_forum.html.erb
+++ b/app/views/lectures/edit/_forum.html.erb
@@ -1,49 +1,20 @@
-  <div class="accordion-item bg-light">
-    <div class="accordion-header">
-      <button class="accordion-button collapsed"
-              type="button"
-              id="forum_heading"
-              data-bs-toggle="collapse"
-              data-bs-target="#forum_collapse"
-              aria-expanded="false"
-              aria-controls="forum_collapse">
-        <div class="row">
-          <div class="col-12">
-            <h5>
-              <%= t('categories.board') %>
-            </h5>
-          </div>
-        </div>
-      </button>
-    </div>
-    <div id="forum_collapse"
-         class="collapse"
-         role="tabpanel"
-         aria-labelledby="heading"
-         data-bs-parent="#lectureAccordion">
-      <div class="accordion-body">
-        <div class="row">
-          <div class="col-12 text-center" id="forum-buttons">
-            <% if lecture.forum? && lecture.forum %>
-              <% if lecture.forum&.locked %>
-                <%= link_to t('buttons.unlock_board'),
-                            unlock_forum_path(lecture),
-                            class: 'btn btn-sm btn-primary' %>
-              <% else %>
-                <%= link_to t('buttons.lock_board'),
-                            lock_forum_path(lecture),
-                            class: 'btn btn-sm btn-primary' %>
-              <% end %>
-              <%= link_to t('buttons.delete_board'),
-                          destroy_forum_path(lecture),
-                          class: 'btn btn-sm btn-danger' %>
-            <% else %>
-              <%= link_to t('buttons.add_board'),
-                          add_forum_path(lecture),
-                          class: 'btn btn-sm btn-primary' %>
-            <% end %>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
\ No newline at end of file
+<div class="col-12 text-center" id="forum-buttons">
+  <% if lecture.forum? && lecture.forum %>
+    <% if lecture.forum&.locked %>
+      <%= link_to t('buttons.unlock_board'),
+                  unlock_forum_path(lecture),
+                  class: 'btn btn-sm btn-primary' %>
+    <% else %>
+      <%= link_to t('buttons.lock_board'),
+                  lock_forum_path(lecture),
+                  class: 'btn btn-sm btn-primary' %>
+    <% end %>
+    <%= link_to t('buttons.delete_board'),
+                destroy_forum_path(lecture),
+                class: 'btn btn-sm btn-danger' %>
+  <% else %>
+    <%= link_to t('buttons.add_board'),
+                add_forum_path(lecture),
+                class: 'btn btn-sm btn-primary' %>
+  <% end %>
+</div>
diff --git a/app/views/lectures/edit/_header.html.erb b/app/views/lectures/edit/_header.html.erb
index c75e3ce1e..01be44f43 100644
--- a/app/views/lectures/edit/_header.html.erb
+++ b/app/views/lectures/edit/_header.html.erb
@@ -1,6 +1,6 @@
-<div class="row px-4 py-2 mt-2">
-  <div class="col-7">
-    <h4 class="ps-2">
+<div class="row py-3 mt-4 bg-white">
+  <div class="col-9 d-flex align-content-center">
+    <h4 class="mb-0 fw-bold">
       <span class="badge bg-secondary">
         <%= lecture.sort_localized %>
       </span>
@@ -12,14 +12,14 @@
       <%= lecture.title_with_teacher_no_type %>
       <%= link_to '',
                   lecture_path(lecture),
-                  class: 'fas fa-eye text-dark mt-3',
+                  class: 'fas fa-eye text-dark d-contents',
                   data: { toggle: 'tooltip',
                           placement: 'bottom' },
                   title: t('buttons.show'),
                   style: 'text-decoration: none;' %>
     </h4>
   </div>
-  <div class="col-5 text-end">
+  <div class="col-3 text-end align-content-center">
     <% if current_user.admin || lecture.course.edited_by?(current_user) %>
       <%= link_to t('buttons.parent_course'),
                   edit_course_path(lecture.course),
diff --git a/app/views/lectures/edit/_imported_media.html.erb b/app/views/lectures/edit/_imported_media.html.erb
index 03e1cccb3..228b07672 100644
--- a/app/views/lectures/edit/_imported_media.html.erb
+++ b/app/views/lectures/edit/_imported_media.html.erb
@@ -1,53 +1,24 @@
-<div class="accordion-item bg-light">
-    <div class="accordion-header">
-      <button class="accordion-button collapsed"
-              type="button"
-              id="imported_media_heading"
-              data-bs-toggle="collapse"
-              data-bs-target="#imported_media_collapse"
-              aria-expanded="false"
-              aria-controls="imported_media_collapse">
-        <div class="row">
-          <div class="col-12">
-            <h5 id="importMedia"
-                data-lecture="<%= lecture.id %>">
-              <%= t('admin.lecture.imported_media') %>
-              <span id="importedMediaCount">
-                (<%= lecture.imported_media.size %>)
-              </span>
-            </h5>
-          </div>
-        </div>
-      </button>
-    </div>
-    <div id="imported_media_collapse"
-         class="collapse"
-         role="tabpanel"
-         aria-labelledby="heading"
-         data-bs-parent="#lectureAccordion">
-      <div class="accordion-body">
-        <div id="importedMediaTable"
-             data-nomedia="<%= t('admin.lecture.no_imported_media') %>">
-          <%= render partial: 'lectures/import/imported_media',
-                     locals: { media: lecture.imported_media,
-                               lecture: lecture } %>
-        </div>
-        <div class="row mb-2">
-          <div class="col-12 text-center">
-            <button role="button"
-                    class="btn btn-sm btn-secondary"
-                    id="import-media-button">
-              <%= t('buttons.import_media') %>
-            </button>
-          </div>
-        </div>
-        <div id="importedMediaArea">
-          <hr>
-          <%= render partial: 'media/catalog/search_form',
-                     locals: { purpose: 'import' } %>
-          <div id="media-search-results">
-          </div>
-        </div>
-      </div>
-    </div>
-</div>
\ No newline at end of file
+<div id="importedMediaTable"
+      data-nomedia="<%= t('admin.lecture.no_imported_media') %>">
+  <%= render partial: 'lectures/import/imported_media',
+              locals: { media: lecture.imported_media,
+                        lecture: lecture } %>
+</div>
+
+<div class="row mb-2">
+  <div class="col-12 text-center">
+    <button role="button"
+            class="btn btn-sm btn-secondary"
+            id="import-media-button">
+      <%= t('buttons.import_media') %>
+    </button>
+  </div>
+</div>
+
+<div id="importedMediaArea">
+  <hr>
+  <%= render partial: 'media/catalog/search_form',
+              locals: { purpose: 'import' } %>
+  <div id="media-search-results">
+  </div>
+</div>
diff --git a/app/views/lectures/edit/_organizational_concept.html.erb b/app/views/lectures/edit/_organizational_concept.html.erb
index ef5875a98..759597fc6 100644
--- a/app/views/lectures/edit/_organizational_concept.html.erb
+++ b/app/views/lectures/edit/_organizational_concept.html.erb
@@ -1,85 +1,58 @@
-  <div class="accordion-item bg-light">
-    <div class="accordion-header">
-      <button class="accordion-button collapsed"
-              type="button"
-              id="organizational_heading"
-              data-bs-toggle="collapse"
-              data-bs-target="#organizational_collapse"
-              aria-expanded="false"
-              aria-controls="organizational_collapse">
-        <div class="row">
-          <div class="col-12">
-            <h5>
-              <%= t('categories.organizational_html') %>
-            </h5>
-          </div>
+<%= form_with model: lecture,
+              html: { id: 'lecture-organizational-form' } do |f| %>
+  <div class="row mb-3">
+    <div class="col-6">
+      <div class="form-check">
+        <%= f.check_box :organizational,
+                        class: 'form-check-input' %>
+        <%= f.label :organizational,
+                    t('admin.lecture.organizational_visible'),
+                    { class: 'form-check-label' } %>
+        <%= helpdesk(t('admin.lecture.info.organizational'), false) %>
+      </div>
+    </div>
+    <div class="col-6">
+      <div class="form-check">
+        <%= f.check_box :muesli,
+                        class: 'form-check-input' %>
+        <%= f.label :muesli,
+                    t('admin.lecture.uses_muesli'),
+                    { class: 'form-label' } %>
+        <%= helpdesk(t('admin.lecture.info.muesli'), false) %>
+      </div>
+    </div>
+    <% if !lecture.term && lecture.organizational %>
+      <div class="col-6">
+        <div class="form-check">
+          <%= f.check_box :organizational_on_top,
+                          class: 'form-check-input' %>
+          <%= f.label :organizational_on_top,
+                      t('admin.lecture.organizational_on_top'),
+                        { class: 'form-check-label' } %>
+          <%= helpdesk(t('admin.lecture.info.organizational_on_top'),
+                        false) %>
         </div>
-      </button>
+      </div>
+    <% end %>
+  </div>
+  <div class="row">
+    <div class="col-12">
+      <%= f.trix_editor :organizational_concept,
+                        id: 'lecture-concept-trix',
+                        data: { content: lecture.organizational_concept } %>
     </div>
-    <div id="organizational_collapse"
-         class="collapse"
-         role="tabpanel"
-         aria-labelledby="heading"
-         data-bs-parent="#lectureAccordion">
-      <div class="accordion-body">
-        <%= form_with model: lecture,
-                      html: { id: 'lecture-organizational-form' } do |f| %>
-          <div class="row mb-3">
-            <div class="col-6">
-              <div class="form-check">
-                <%= f.check_box :organizational,
-                                class: 'form-check-input' %>
-                <%= f.label :organizational,
-                            t('admin.lecture.organizational_visible'),
-                            { class: 'form-check-label' } %>
-                <%= helpdesk(t('admin.lecture.info.organizational'), false) %>
-              </div>
-            </div>
-            <div class="col-6">
-              <div class="form-check">
-                <%= f.check_box :muesli,
-                                class: 'form-check-input' %>
-                <%= f.label :muesli,
-                            t('admin.lecture.uses_muesli'),
-                            { class: 'form-label' } %>
-                <%= helpdesk(t('admin.lecture.info.muesli'), false) %>
-              </div>
-            </div>
-            <% if !lecture.term && lecture.organizational %>
-              <div class="col-6">
-                <div class="form-check">
-                  <%= f.check_box :organizational_on_top,
-                                  class: 'form-check-input' %>
-                  <%= f.label :organizational_on_top,
-                              t('admin.lecture.organizational_on_top'),
-                                { class: 'form-check-label' } %>
-                  <%= helpdesk(t('admin.lecture.info.organizational_on_top'),
-                               false) %>
-                </div>
-              </div>
-            <% end %>
-          </div>
-          <div class="row">
-            <div class="col-12">
-              <%= f.trix_editor :organizational_concept,
-                                id: 'lecture-concept-trix',
-                                data: { content: lecture.organizational_concept } %>
-            </div>
-          </div>
-          <div class="row mt-3">
-            <div class="col-12 text-center">
-              <div id="lecture-organizational-warning">
-                <%= t('warnings.unsaved_changes') %>
-                <%= f.submit t('buttons.save_and_exit'),
-                             class: "btn btn-primary" %>
-                <button type="button" id="cancel-lecture-organizational"
-                        class="btn btn-secondary">
-                  <%= t('buttons.cancel') %>
-                </button>
-              </div>
-            </div>
-          </div>
-        <% end %>
+  </div>
+  <div class="row mt-3">
+    <div class="col-12 text-center">
+      <div id="lecture-organizational-warning">
+        <%= t('warnings.unsaved_changes') %>
+        <%= f.submit t('buttons.save_and_exit'),
+                      class: "btn btn-primary" %>
+        <button type="button" id="cancel-lecture-organizational"
+                class="btn btn-secondary">
+          <%= t('buttons.cancel') %>
+        </button>
       </div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
+<% end %>
diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index c32de1a3b..eb8072a28 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -1,128 +1,101 @@
-  <div class="accordion-item bg-light">
-    <div class="accordion-header">
-      <button class="accordion-button collapsed"
-              type="button"
-              id="people_heading"
-              data-bs-toggle="collapse"
-              data-bs-target="#people_collapse"
-              aria-expanded="false"
-              aria-controls="people_collapse">
-        <div class="row">
-          <div class="col-12">
-            <h5>
-              <%= t('basics.people') %>
-            </h5>
+<% if current_user.can_update_personell?(lecture) %>
+  <%= form_with model: lecture, html: { id: 'lecture-form' } do |f| %>
+    <div class="row">
+      <div class="col-4 mb-3">
+        <%= f.label :teacher_id,
+                    t('basics.teacher'),
+                  class: "form-label" %>
+        <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
+        <div id="lecture_teacher_select" %>
+          <%= f.select :teacher_id,
+                        options_for_select([[lecture.teacher.info,
+                                            lecture.teacher.id]],
+                                            lecture.teacher.id),
+                        {},
+                        { class: 'selectize',
+                          data: { ajax: true,
+                             model: 'user',
+                                  filled: false,
+                                  placeholder:
+                                    t('basics.enter_two_letters'),
+                                  no_results:
+                                    t('basics.no_results') } } %>
+          <div class="invalid-feedback" id="lecture-teacher-error">
           </div>
         </div>
-      </button>
-    </div>
-    <div id="people_collapse"
-         class="collapse"
-         role="tabpanel"
-         aria-labelledby="heading"
-         data-bs-parent="#lectureAccordion">
-      <div class="accordion-body">
-        <% if current_user.can_update_personell?(lecture) %>
-          <%= form_with model: lecture, html: { id: 'lecture-form' } do |f| %>
-            <div class="row">
-              <div class="col-4 mb-3">
-                <%= f.label :teacher_id,
-                            t('basics.teacher'),
-                          class: "form-label" %>
-                <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
-                <div id="lecture_teacher_select" %>
-                  <%= f.select :teacher_id,
-                               options_for_select([[lecture.teacher.info,
-                                                    lecture.teacher.id]],
-                                                    lecture.teacher.id),
-                               {},
-                               { class: 'selectize',
-                                 data: { ajax: true,
-                                         model: 'user',
-                                         filled: false,
-                                         placeholder:
-                                           t('basics.enter_two_letters'),
-                                         no_results:
-                                           t('basics.no_results') } } %>
-                  <div class="invalid-feedback" id="lecture-teacher-error">
-                  </div>
-                </div>
-              </div>
-              <div class="col-4">
-                <%= t('basics.course_editors') %>
-                <%= helpdesk(t('admin.lecture.info.course_editors'), false) %>
-                <% if lecture.course.editors.present? %>
-                  <ul>
-                    <% lecture.course.editors.each do |e| %>
-                      <li>
-                        <%= e.name %>
-                      </li>
-                    <% end %>
-                  </ul>
-                <% else %>
-                  <br>
-                  <%= t('admin.lecture.no_course_editors') %>
-                <% end %>
-              </div>
-              <div class="col-4 mb-3">
-                <%= f.label :editor_ids,
-                            t('basics.lecture_editors'),
-                          class: "form-label" %>
-                <%= helpdesk(t('admin.lecture.info.lecture_editors'), false) %>
-                <div id="lecture_editors_select" %>
-                  <%= f.select :editor_ids,
-                               options_for_select([[t('none'), '']] +
-                                                  lecture.select_editors,
-                                                  lecture.editors.map(&:id)),
-                               {},
-                               { multiple: true,
-                                 class: 'selectize',
-                                 data: { ajax: true,
-                                         model: 'user',
-                                         filled: false,
-                                         placeholder: t('basics.enter_two_letters'),
-                                         no_results: t('basics.no_results') } } %>
-                </div>
-              </div>
-            </div>
-            <div class="row mb-3">
-              <div class="col-12">
-                <%= t('basics.subscribers_count_nc') %>
-                <span id="lectureUserCounter">
-                  <%= lecture.users.count %>
-                </span>
-                <%= helpdesk(t('admin.lecture.info.subscribers_count'), false) %>
-                <% if lecture.users.any? && !lecture.stale? %>
-                  <button type="button"
-                          id="lectureUserModalButton"
-                          class="ms-3 btn btn-outline-primary btn-sm"
-                          data-bs-toggle="modal"
-                          data-bs-target="#lectureUserModal">
-                    <%= t('basics.details') %>
-                  </button>
-                <% end %>
-              </div>
-            </div>
-            <div class="row mt-3">
-              <div class="col-12 text-center">
-                <div id="lecture-basics-warning">
-                  <%= t('warnings.unsaved_changes') %>
-                  <%= f.submit t('buttons.save'),
-                      class: "btn btn-sm btn-primary" %>
-                  <button type="button"
-                          class="btn btn-sm btn-secondary ms-2"
-                          id="lecture-basics-cancel"
-                          data-id="<%= lecture.id %>">
-                    <%= t('buttons.discard') %>
-                  </button>
-                </div>
-              </div>
-            </div>
-          <% end %>
+      </div>
+      <div class="col-4">
+        <%= t('basics.course_editors') %>
+        <%= helpdesk(t('admin.lecture.info.course_editors'), false) %>
+        <% if lecture.course.editors.present? %>
+          <ul>
+            <% lecture.course.editors.each do |e| %>
+              <li>
+                <%= e.name %>
+              </li>
+            <% end %>
+          </ul>
         <% else %>
-          <%= t('admin.lecture.no_access_to_users_html',
-                project_mail: mail_to(DefaultSetting::PROJECT_EMAIL, nil)) %>
+          <br>
+          <%= t('admin.lecture.no_course_editors') %>
+        <% end %>
+      </div>
+      <div class="col-4 mb-3">
+        <%= f.label :editor_ids,
+                    t('basics.lecture_editors'),
+                  class: "form-label" %>
+        <%= helpdesk(t('admin.lecture.info.lecture_editors'), false) %>
+        <div id="lecture_editors_select" %>
+          <%= f.select :editor_ids,
+                        options_for_select([[t('none'), '']] +
+                                          lecture.select_editors,
+                                          lecture.editors.map(&:id)),
+                        {},
+                        { multiple: true,
+                          class: 'selectize',
+                          data: { ajax: true,
+                                  model: 'user',
+                                  filled: false,
+                                  placeholder: t('basics.enter_two_letters'),
+                                  no_results: t('basics.no_results') } } %>
+        </div>
+      </div>
+    </div>
+    <div class="row mb-3">
+      <div class="col-12">
+        <%= t('basics.subscribers_count_nc') %>
+        <span id="lectureUserCounter">
+          <%= lecture.users.count %>
+        </span>
+        <%= helpdesk(t('admin.lecture.info.subscribers_count'), false) %>
+        <% if lecture.users.any? && !lecture.stale? %>
+          <button type="button"
+                  id="lectureUserModalButton"
+                  class="ms-3 btn btn-outline-primary btn-sm"
+                  data-bs-toggle="modal"
+                  data-bs-target="#lectureUserModal">
+            <%= t('basics.details') %>
+          </button>
         <% end %>
       </div>
     </div>
-  </div>
+    <div class="row mt-3">
+      <div class="col-12 text-center">
+        <div id="lecture-basics-warning">
+          <%= t('warnings.unsaved_changes') %>
+          <%= f.submit t('buttons.save'),
+              class: "btn btn-sm btn-primary" %>
+          <button type="button"
+                  class="btn btn-sm btn-secondary ms-2"
+                  id="lecture-basics-cancel"
+                  data-id="<%= lecture.id %>">
+            <%= t('buttons.discard') %>
+          </button>
+        </div>
+      </div>
+    </div>
+  <% end %>
+<% else %>
+  <%= t('admin.lecture.no_access_to_users_html',
+        project_mail: mail_to(DefaultSetting::PROJECT_EMAIL, nil)) %>
+<% end %>
diff --git a/app/views/lectures/edit/_preferences.html.erb b/app/views/lectures/edit/_preferences.html.erb
index 9fb9adfcd..8a2b3c3da 100644
--- a/app/views/lectures/edit/_preferences.html.erb
+++ b/app/views/lectures/edit/_preferences.html.erb
@@ -1,177 +1,150 @@
-  <div class="accordion-item bg-light">
-    <div class="accordion-header">
-      <button class="accordion-button collapsed"
-              type="button"
-              id="preferences_heading"
-              data-bs-toggle="collapse"
-              data-bs-target="#preferences_collapse"
-              aria-expanded="false"
-              aria-controls="preferences_collapse">
-        <div class="row">
-          <div class="col-12">
-            <h5>
-              <%= t('basics.preferences') %>
-            </h5>
-          </div>
+<%= form_with model: lecture,
+              html: { id: 'lecture-preferences-form' } do |f| %>
+  <div class="row">
+    <% unless lecture.course.term_independent %>
+      <div class="col-6 mb-3">
+        <%= f.label :term_id,
+                    t('basics.term'),
+                    class: "form-label" %>
+        <%= helpdesk(t('admin.lecture.info.term'), false) %>
+        <%= f.select :term_id,
+                      options_for_select(@terms,
+                                        lecture.term&.id),
+                      {},
+                      { class: 'form-select' } %>
+        <div class="invalid-feedback"
+              id="lecture-term-error">
         </div>
-      </button>
+      </div>
+    <% end %>
+    <% unless lecture.course.term_independent %>
+      <div class="col-6 mb-3">
+        <%= f.label :sort,
+                    t('basics.type'),
+                    class: "form-label" %>
+        <%= f.select :sort,
+                      options_for_select(Lecture.sort_localized.invert.to_a,
+                                        lecture.sort),
+                      {},
+                      { class: 'form-select' } %>
+        <div class="invalid-feedback"
+              id="lecture-term-error">
+        </div>
+      </div>
+    <% end %>
+    <% unless lecture.seminar? %>
+      <div class="col-6 mb-3">
+        <%= f.label :start_chapter, t('admin.lecture.first_chapter'),
+                    class: "form-label" %>
+        <%= helpdesk(t('admin.lecture.info.first_chapter'), false) %>
+        <%= f.number_field :start_chapter,
+                            value: lecture.start_chapter || 1,
+                            class: 'form-control' %>
+      </div>
+      <div class="col-6 mt-6">
+        <div id="start-section-input">
+          <%= f.label :start_section,
+                      t('admin.lecture.first_section'),
+                      class: "form-label" %>
+          <%= helpdesk(t('admin.lecture.info.first_section'), false) %>
+          <%= f.number_field :start_section,
+                              value: lecture.start_section || 1,
+                              class: 'form-control',
+                              disabled: !lecture.absolute_numbering %>
+        </div>
+      </div>
+      <div class="col-6 mt-6 mb-3">
+        <div class="form-check">
+          <%= f.check_box :absolute_numbering,
+                          class: 'form-check-input' %>
+          <%= f.label :absolute_numbering,
+                      t('admin.lecture.absolute_numbering'),
+                      { class: 'form-check-label' } %>
+          <%= helpdesk(t('admin.lecture.info.absolute_numbering'),
+                        false) %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+  <div class="row">
+    <div class="col-auto mb-3">
+      <%= f.label :passphrase,
+                  t('admin.lecture.passphrase'),
+                  class: "form-label" %>
+      <%= helpdesk(t('admin.lecture.info.passphrase'), false) %>
+      <%= f.text_field :passphrase,
+                        { class: 'form-control',
+                          size: 50 } %>
+    </div>
+  </div>
+  <div class="mb-3">
+    <%= t('basics.language') %>
+    <div class="row ms-2">
+    <% I18n.available_locales.each do |locale| %>
+      <div class="form-check form-check-inline">
+        <%= f.radio_button :locale,
+                            locale.to_s,
+                            class: 'form-check-input' %>
+        <%= f.label :locale,
+                    t('locales.' + locale.to_s),
+                    value: locale.to_s,
+                    class: 'form-check-label' %>
+      </div>
+    <% end %>
+    </div>
+  </div>
+  <% unless lecture.seminar? %>
+    <div class="mb-3">
+      <%= t('admin.lecture.content_mode') %>
+      <%= helpdesk(t('admin.lecture.info.variants'), true) %>
+      <div class="row ms-2">
+        <div class="form-check form-check-inline">
+          <%= f.radio_button :content_mode,
+                              'video',
+                              class: 'form-check-input' %>
+          <%= f.label :content_mode,
+                      t('admin.lecture.video_based'),
+                      value: 'video',
+                      class: 'form-check-label' %>
+        </div>
+        <div class="form-check form-check-inline">
+          <%= f.radio_button :content_mode,
+                              'manuscript',
+                              class: 'form-check-input' %>
+          <%= f.label :content_mode,
+                      t('admin.lecture.script_based'),
+                      value: 'manuscript',
+                      class: 'form-check-label' %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+  <% if !lecture.term %>
+    <div class="row">
+      <div class="col-12">
+        <div class="form-check">
+          <%= f.check_box :disable_teacher_display,
+                          class: 'form-check-input' %>
+          <%= f.label :disable_teacher_display,
+                      t('admin.lecture.disable_teacher_display'),
+                      { class: 'form-check-label' } %>
+          <%= helpdesk(t('admin.lecture.info.disable_teacher_display'),
+                      false) %>
+        </div>
+      </div>
     </div>
-    <div id="preferences_collapse"
-         class="collapse"
-         role="tabpanel"
-         aria-labelledby="heading"
-         data-bs-parent="#lectureAccordion">
-      <div class="accordion-body">
-        <%= form_with model: lecture,
-                      html: { id: 'lecture-preferences-form' } do |f| %>
-          <div class="row">
-            <% unless lecture.course.term_independent %>
-              <div class="col-6 mb-3">
-                <%= f.label :term_id,
-                            t('basics.term'),
-                            class: "form-label" %>
-                <%= helpdesk(t('admin.lecture.info.term'), false) %>
-                <%= f.select :term_id,
-                             options_for_select(@terms,
-                                                lecture.term&.id),
-                             {},
-                             { class: 'form-select' } %>
-                <div class="invalid-feedback"
-                     id="lecture-term-error">
-                </div>
-              </div>
-            <% end %>
-            <% unless lecture.course.term_independent %>
-              <div class="col-6 mb-3">
-                <%= f.label :sort,
-                            t('basics.type'),
-                            class: "form-label" %>
-                <%= f.select :sort,
-                             options_for_select(Lecture.sort_localized.invert.to_a,
-                                                lecture.sort),
-                             {},
-                             { class: 'form-select' } %>
-                <div class="invalid-feedback"
-                     id="lecture-term-error">
-                </div>
-              </div>
-            <% end %>
-            <% unless lecture.seminar? %>
-              <div class="col-6 mb-3">
-                <%= f.label :start_chapter, t('admin.lecture.first_chapter'),
-                            class: "form-label" %>
-                <%= helpdesk(t('admin.lecture.info.first_chapter'), false) %>
-                <%= f.number_field :start_chapter,
-                                   value: lecture.start_chapter || 1,
-                                   class: 'form-control' %>
-              </div>
-              <div class="col-6 mt-6">
-                <div id="start-section-input">
-                  <%= f.label :start_section,
-                              t('admin.lecture.first_section'),
-                              class: "form-label" %>
-                  <%= helpdesk(t('admin.lecture.info.first_section'), false) %>
-                  <%= f.number_field :start_section,
-                                     value: lecture.start_section || 1,
-                                     class: 'form-control',
-                                     disabled: !lecture.absolute_numbering %>
-                </div>
-              </div>
-              <div class="col-6 mt-6 mb-3">
-                <div class="form-check">
-                  <%= f.check_box :absolute_numbering,
-                                  class: 'form-check-input' %>
-                  <%= f.label :absolute_numbering,
-                              t('admin.lecture.absolute_numbering'),
-                              { class: 'form-check-label' } %>
-                  <%= helpdesk(t('admin.lecture.info.absolute_numbering'),
-                               false) %>
-                </div>
-              </div>
-            <% end %>
-          </div>
-          <div class="row">
-            <div class="col-auto mb-3">
-              <%= f.label :passphrase,
-                          t('admin.lecture.passphrase'),
-                          class: "form-label" %>
-              <%= helpdesk(t('admin.lecture.info.passphrase'), false) %>
-              <%= f.text_field :passphrase,
-                               { class: 'form-control',
-                                 size: 50 } %>
-            </div>
-          </div>
-          <div class="mb-3">
-            <%= t('basics.language') %>
-            <div class="row ms-2">
-            <% I18n.available_locales.each do |locale| %>
-              <div class="form-check form-check-inline">
-                <%= f.radio_button :locale,
-                                   locale.to_s,
-                                   class: 'form-check-input' %>
-                <%= f.label :locale,
-                            t('locales.' + locale.to_s),
-                            value: locale.to_s,
-                            class: 'form-check-label' %>
-              </div>
-            <% end %>
-            </div>
-          </div>
-          <% unless lecture.seminar? %>
-            <div class="mb-3">
-              <%= t('admin.lecture.content_mode') %>
-              <%= helpdesk(t('admin.lecture.info.variants'), true) %>
-              <div class="row ms-2">
-                <div class="form-check form-check-inline">
-                  <%= f.radio_button :content_mode,
-                                     'video',
-                                     class: 'form-check-input' %>
-                  <%= f.label :content_mode,
-                              t('admin.lecture.video_based'),
-                              value: 'video',
-                              class: 'form-check-label' %>
-                </div>
-                <div class="form-check form-check-inline">
-                  <%= f.radio_button :content_mode,
-                                     'manuscript',
-                                     class: 'form-check-input' %>
-                  <%= f.label :content_mode,
-                              t('admin.lecture.script_based'),
-                              value: 'manuscript',
-                              class: 'form-check-label' %>
-                </div>
-              </div>
-            </div>
-          <% end %>
-          <% if !lecture.term %>
-            <div class="row">
-              <div class="col-12">
-                <div class="form-check">
-                  <%= f.check_box :disable_teacher_display,
-                                  class: 'form-check-input' %>
-                  <%= f.label :disable_teacher_display,
-                              t('admin.lecture.disable_teacher_display'),
-                              { class: 'form-check-label' } %>
-                  <%= helpdesk(t('admin.lecture.info.disable_teacher_display'),
-                             false) %>
-                </div>
-              </div>
-            </div>
-          <% end %>
-          <div class="row">
-            <div class="col-12 text-center">
-              <div id="lecture-preferences-warning">
-                <%= t('warnings.unsaved_changes') %>
-                <%= f.submit t('buttons.save_and_exit'),
-                             class: "btn btn-primary" %>
-                <button type="button" id="cancel-lecture-preferences"
-                        class="btn btn-secondary">
-                  <%= t('buttons.cancel') %>
-                </button>
-              </div>
-            </div>
-          </div>
-        <% end %>
+  <% end %>
+  <div class="row">
+    <div class="col-12 text-center">
+      <div id="lecture-preferences-warning">
+        <%= t('warnings.unsaved_changes') %>
+        <%= f.submit t('buttons.save_and_exit'),
+                      class: "btn btn-primary" %>
+        <button type="button" id="cancel-lecture-preferences"
+                class="btn btn-secondary">
+          <%= t('buttons.cancel') %>
+        </button>
       </div>
     </div>
   </div>
+<% end %>
diff --git a/app/views/lectures/edit/_tags.html.erb b/app/views/lectures/edit/_tags.html.erb
index 391797b3c..48257b2dd 100644
--- a/app/views/lectures/edit/_tags.html.erb
+++ b/app/views/lectures/edit/_tags.html.erb
@@ -1,65 +1,37 @@
-  <div class="accordion-item bg-light">
-    <div class="accordion-header">
-      <button class="accordion-button collapsed"
-              type="button"
-              id="tags_heading"
-              data-bs-toggle="collapse"
-              data-bs-target="#tags_collapse"
-              aria-expanded="false"
-              aria-controls="tags_collapse">
-        <div class="row">
-          <div class="col-12">
-            <h5 class="text-dark">
-              <%= t('admin.lecture.related_tags') %>
-              <%= ' (' + lecture.tags.size.to_s + ') '%>
-            </h5>
-          </div>
-        </div>
-      </button>
-    </div>
-    <div id="tags_collapse"
-         class="collapse"
-         role="tabpanel"
-         aria-labelledby="heading"
-         data-bs-parent="#lectureAccordion">
-      <div class="accordion-body">
-        <ul>
-          <li class="mb-2">
-            <h6>
-              <%= t('admin.lecture.course_tags_html',
-                    course: course_link_or_text(lecture.course, current_user),
-                    count: @course_tags.size) %>
-              <%= helpdesk(t('admin.lecture.info.course_tags'), false) %>
-            </h6>
-            <% if @course_tags %>
-              <%= render partial: "tags/tag",
-                         collection: @course_tags.natural_sort_by(&:title),
-                         cached: true %>
-            <% else %>
-              <%= t('admin.lecture.no_course_tags') %>
-            <% end %>
-          </li>
-          <li class="mb-2">
-            <h6>
-              <%= t('admin.lecture.additional_tags',
-                    count: @extra_tags.size) %>
-              <%= helpdesk(t('admin.lecture.info.additional_tags'), false) %>
-            </h6>
-            <%= render partial: "tags/tag",
-                       collection: @extra_tags.natural_sort_by(&:title),
-                       cached: true %>
-          </li>
-          <li>
-            <h6>
-              <%= t('admin.lecture.untreated_tags',
-                    count: @deferred_tags.size) %>
-              <%= helpdesk(t('admin.lecture.info.untreated_tags'), false) %>
-            </h6>
-            <%= render partial: "tags/tag",
-                       collection: @deferred_tags.natural_sort_by(&:title),
-                       cached: true %>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </div>
+<ul>
+  <li class="mb-2">
+    <h6>
+      <%= t('admin.lecture.course_tags_html',
+            course: course_link_or_text(lecture.course, current_user),
+            count: @course_tags.size) %>
+      <%= helpdesk(t('admin.lecture.info.course_tags'), false) %>
+    </h6>
+    <% if @course_tags %>
+      <%= render partial: "tags/tag",
+                  collection: @course_tags.natural_sort_by(&:title),
+                  cached: true %>
+    <% else %>
+      <%= t('admin.lecture.no_course_tags') %>
+    <% end %>
+  </li>
+  <li class="mb-2">
+    <h6>
+      <%= t('admin.lecture.additional_tags',
+            count: @extra_tags.size) %>
+      <%= helpdesk(t('admin.lecture.info.additional_tags'), false) %>
+    </h6>
+    <%= render partial: "tags/tag",
+                collection: @extra_tags.natural_sort_by(&:title),
+                cached: true %>
+  </li>
+  <li>
+    <h6>
+      <%= t('admin.lecture.untreated_tags',
+            count: @deferred_tags.size) %>
+      <%= helpdesk(t('admin.lecture.info.untreated_tags'), false) %>
+    </h6>
+    <%= render partial: "tags/tag",
+                collection: @deferred_tags.natural_sort_by(&:title),
+                cached: true %>
+  </li>
+</ul>
diff --git a/app/views/lectures/edit/_tutorials.html.erb b/app/views/lectures/edit/_tutorials.html.erb
index 8152e34eb..46d207fdf 100644
--- a/app/views/lectures/edit/_tutorials.html.erb
+++ b/app/views/lectures/edit/_tutorials.html.erb
@@ -1,69 +1,42 @@
-<div class="accordion-item bg-light">
-  <div class="accordion-header">
-    <button class="accordion-button collapsed"
-            type="button"
-            id="exercises_heading"
-            data-bs-toggle="collapse"
-            data-bs-target="#exercises_collapse"
-            aria-expanded="false"
-            aria-controls="exercises_collapse">
+<% if current_user.can_update_personell?(lecture) %>
+  <div class="row mb-3">
+    <div class="col-12 text-center">
+      <%= link_to t('admin.tutorial.new'),
+                  new_tutorial_path(params: { lecture_id: lecture.id }),
+                  class: 'btn btn-sm btn-primary',
+                  id: 'newTutorialButton',
+                  remote: true %>
+    </div>
+  </div>
+  <div class="list-group">
+    <div class="list-group-item bg-light"
+          id="tutorialListHeader"
+          style="display: <%= show(lecture.tutorials.any?) %>">
       <div class="row">
-        <div class="col-12">
-          <h5>
-            <%= t('basics.tutorials') %>
-          </h5>
+        <div class="col-4">
+          <h6>
+            <%= t('basics.title') %>
+          </h6>
         </div>
-      </div>
-    </button>
-  </div>
-  <div id="exercises_collapse"
-       class="collapse"
-       role="tabpanel"
-       aria-labelledby="heading"
-       data-bs-parent="#lectureAccordion">
-    <div class="accordion-body">
-      <% if current_user.can_update_personell?(lecture) %>
-        <div class="row mb-3">
-          <div class="col-12 text-center">
-            <%= link_to t('admin.tutorial.new'),
-                        new_tutorial_path(params: { lecture_id: lecture.id }),
-                        class: 'btn btn-sm btn-primary',
-                        id: 'newTutorialButton',
-                        remote: true %>
-          </div>
+        <div class="col-4">
+          <h6>
+            <%= t('basics.tutors') %>
+          </h6>
         </div>
-        <div class="list-group">
-          <div class="list-group-item bg-light"
-               id="tutorialListHeader"
-               style="display: <%= show(lecture.tutorials.any?) %>">
-            <div class="row">
-              <div class="col-4">
-                <h6>
-                  <%= t('basics.title') %>
-                </h6>
-              </div>
-              <div class="col-4">
-                <h6>
-                  <%= t('basics.tutors') %>
-                </h6>
-              </div>
-              <div class="col-4">
-                <h6>
-                  <%= t('basics.action') %>
-                  <%= helpdesk(t('tutorial.destruction_info'), true) %>
-                </h6>
-              </div>
-            </div>
-          </div>
-          <% lecture.tutorials.each do |t| %>
-            <%= render partial: 'tutorials/row',
-                       locals: { tutorial: t } %>
-          <% end %>
+        <div class="col-4">
+          <h6>
+            <%= t('basics.action') %>
+            <%= helpdesk(t('tutorial.destruction_info'), true) %>
+          </h6>
         </div>
-      <% else %>
-          <%= t('admin.lecture.no_access_to_users_html',
-                project_mail: mail_to(DefaultSetting::PROJECT_EMAIL, nil)) %>
-      <% end %>
+      </div>
     </div>
+    <% lecture.tutorials.each do |t| %>
+      <%= render partial: 'tutorials/row',
+                  locals: { tutorial: t } %>
+    <% end %>
   </div>
-</div>
\ No newline at end of file
+<% else %>
+    <%= t('admin.lecture.no_access_to_users_html',
+          project_mail: mail_to(DefaultSetting::PROJECT_EMAIL, nil)) %>
+<% end %>