diff --git a/static/css/design.css b/static/css/design.css
index 9e11d5d..5883f0f 100644
--- a/static/css/design.css
+++ b/static/css/design.css
@@ -20,6 +20,10 @@
 .has-background-prosoft a,
 .has-background-prosoft abbr { color: var(--prosoft-inv); }
 
+.table thead tr.has-background-prosoft th {
+  color: var(--prosoft-inv) !important;
+}
+
 abbr { text-decoration: none; }
 
 /* =========================
@@ -282,7 +286,6 @@ body.dark-mode a { color: #bb86fc; }
 .erp-tabs {
   display: flex;
   border-bottom: 2px solid var(--prosoft-normal);
-  margin-bottom: 1rem;
 }
 
 .erp-tabs a {
diff --git a/templates/risks/item_risk.html b/templates/risks/item_risk.html
index ddb69f4..edd5a78 100644
--- a/templates/risks/item_risk.html
+++ b/templates/risks/item_risk.html
@@ -1,53 +1,29 @@
 {% extends "base.html" %}
 {% load i18n risk_extras %}
+
 {% block crumbs %}
   <li><a href="{% url 'risks:list_risks' %}">{% trans "Risk analysis" %}</a></li>
-  <li><a href="{% url 'risks:show_risk' risk.id %}">{{ risk.title }}</a></li>
+  <li><a href="{% url 'risks:show_risk' risk.id %}">{% trans "Risk" %}: {{ risk.title }}</a></li>
 {% endblock %}
 {% block content %}
-<div class="container">
-  <section class="hero is-small">
-    <div class="hero-body">
-      <p class="title">{% trans "Risk" %}: {{ risk.title }}</p>
-      <p class="subtitle is-6">{{ risk.description }}</p>
-    </div>
-  </section>
-  <!-- Überblick-->
-  <div class="card">
-    <header class="card-header">
-      <p class="card-header-title">{% trans "Overview" %}</p>
 
-      {% if request.user.is_staff or risk.owner_id == request.user.id %}
-        <form method="post" action="{% url 'risks:update_risk_status' risk.id %}" class="card-header-icon" style="margin-left:auto;">
-          {% csrf_token %}
-          <div class="field has-addons">
-            <div class="control">
-              <div class="select is-small">
-                <select name="status">
-                  {% for value,label in risk.STATUS_CHOICES %}
-                    <option value="{{ value }}" {% if risk.status == value %}selected{% endif %}>{{ label }}</option>
-                  {% endfor %}
-                </select>
-              </div>
-            </div>
-            <div class="control">
-              <button class="button is-small is-link" title="{% trans 'Update status' %}">
-                <span class="icon"><i class="fas fa-save"></i></span>
-              </button>
-            </div>
-          </div>
-        </form>
+<!-- ERP-style tabs under breadcrumb -->
+<div class="erp-tabs">
+  <a class="is-active" data-tab="overview">{% trans "Overview" %}</a>
+  <a data-tab="measures">{% trans "Measures" %}</a>
+  <a data-tab="incidents">{% trans "Incidents" %}</a>
+  <a data-tab="history">{% trans "History" %}</a>
+</div>
 
-        <a class="card-header-icon has-text-warning" href="{% url 'admin:risks_risk_change' risk.pk %}" title="Risiko bearbeiten">
-          <span class="icon"><i class="fas fa-edit" aria-hidden="true"></i></span>
-        </a>
-        <a class="card-header-icon has-text-danger" href="{% url 'admin:risks_risk_delete' risk.pk %}" title="Risiko Löschen (WARNUNG!)">
-          <span class="icon"><i class="fas fa-trash" aria-hidden="true"></i></span>
-        </a>
-      {% endif %}
-    </header>
-    <!-- Inhalt Überblick-->
-    <div class="card-content">
+  <!-- Tab: Overview -->
+  <div class="tab-panel" data-tab="overview">
+    <div class="card">
+      <header class="card-header">
+        <p class="card-header-title">{% trans "Overview" %}</p>
+      </header>
+      <div class="card-content">
+
+        <!-- General info -->
         <div class="columns is-multiline">
           <div class="column is-half">
             <p><strong>{% trans "Asset" %}:</strong> {{ risk.asset|default:"-" }}</p>
@@ -61,54 +37,58 @@
                 <span class="has-text-grey">{% trans "Not yet assigned" %}</span>
               {% endif %}
             </p>
-            <p><strong>{% trans "Status" %}:</strong> {{ risk.status }}</p>
+            <p><strong>{% trans "Status" %}:</strong> {{ risk.get_status_display }}</p>
           </div>
           <div class="column is-half">
             <p><strong>{% trans "Risk owner" %}:</strong> {{ risk.owner|user_display|default:"-" }}</p>
             <p><strong>{% trans "Created at" %}:</strong> {{ risk.created_at|date:'d.m.Y H:i' }}</p>
-            <p><strong>{% trans "updated at" %}:</strong> {{ risk.updated_at|date:'d.m.Y H:i' }}</p>
+            <p><strong>{% trans "Updated at" %}:</strong> {{ risk.updated_at|date:'d.m.Y H:i' }}</p>
             <p><strong>{% trans "Resubmission" %}:</strong> {{ risk.follow_up|date:'d.m.Y' }}</p>
           </div>
         </div>
+
+        <!-- Effects -->
         <section>
-          <h3>Auswirkungen</h3>
-          <p>{{ risk.effects }}</p>
+          <h3 class="title is-6">{% trans "Effects" %}</h3>
+          <p>{{ risk.effects|default:"–" }}</p>
         </section>
-        <!-- Risikobewertung -->
+
+        <!-- Risk assessment -->
         <section class="hero has-text-centered is-small">
           <div class="hero-body">
             <p class="title">{% trans "Risk assessment" %}</p>
           </div>
         </section>
+
         <div class="columns is-multiline">
 
-          <!-- Bruttorisiko -->
-          <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered is-flex">
+          <!-- Gross risk -->
+          <div class="column is-full-mobile is-half-desktop has-text-centered is-flex">
             <div class="box is-flex is-flex-direction-column is-flex-grow-1">
-              <h4>{% trans "Gross (before measures)" %}</h4>
+              <h4 class="title is-6">{% trans "Gross (before measures)" %}</h4>
               <div class="columns is-multiline">
 
-                <!-- Eintrittswahrscheinlichkeit -->
-                <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered">
-                  <button class="risk-chip {{ risk.likelihood|likelihood_class }}" type="button" aria-label="{% trans 'Likelihood' as likelihood_long_name %}">
-                    <span class="chip-head">{% trans "Probability of occurrence" %}</span>
+                <!-- Likelihood -->
+                <div class="column is-half">
+                  <button class="risk-chip {{ risk.likelihood|likelihood_class }}" type="button">
+                    <span class="chip-head">{% trans "Likelihood" %}</span>
                     <span class="chip-id">{{ risk.likelihood }}</span>
                     <span class="chip-label">{{ risk.get_likelihood_display }}</span>
                   </button>
                 </div>
 
-                <!-- Schadensausmaß -->
-                <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered">
-                  <button class="risk-chip {{ risk.impact|impact_class }}" type="button" aria-label="{% trans 'Impact' as impact_long_name %}">
-                    <span class="chip-head">{% trans "Extent of damage" %}</span>
+                <!-- Impact -->
+                <div class="column is-half">
+                  <button class="risk-chip {{ risk.impact|impact_class }}" type="button">
+                    <span class="chip-head">{% trans "Impact" %}</span>
                     <span class="chip-id">{{ risk.impact }}</span>
                     <span class="chip-label">{{ risk.get_impact_display }}</span>
                   </button>
                 </div>
 
-                <!-- Stufe -->
-                <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered">
-                  <button class="risk-chip {{ risk.level|level_class }}" type="button" aria-label="{% trans 'Level' %}">
+                <!-- Level -->
+                <div class="column is-half">
+                  <button class="risk-chip {{ risk.level|level_class }}" type="button">
                     <span class="chip-head">{% trans "Level" %}</span>
                     <span class="chip-id">{{ risk.level|level_id }}</span>
                     <span class="chip-label">{{ risk.level }}</span>
@@ -116,45 +96,45 @@
                 </div>
 
                 <!-- Score -->
-                <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered">
-                  <button class="risk-chip {{ risk.score|score_class }}" type="button" aria-label="{% trans 'Score' %}">
+                <div class="column is-half">
+                  <button class="risk-chip {{ risk.score|score_class }}" type="button">
                     <span class="chip-head">{% trans "Score" %}</span>
                     <span class="chip-id">{{ risk.score }}</span>
-                    <span class="chip-label">Score (max. 20)</span>
+                    <span class="chip-label">Max. 20</span>
                   </button>
                 </div>
 
               </div>
             </div>
-          </div> <!-- Ende Bruttorisiko -->
+          </div><!-- Gross risk End -->
 
-          <!-- Nettorisiko -->
-          <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered is-flex">
+          <!-- Net risk -->
+          <div class="column is-full-mobile is-half-desktop has-text-centered is-flex">
             <div class="box is-flex is-flex-direction-column is-flex-grow-1">
-              <h4>{% trans "Net (after measures)" %}</h4>
+              <h4 class="title is-6">{% trans "Net (after measures)" %}</h4>
               <div class="columns is-multiline">
-              {% if risk.residual_risk %}
-                <!-- Eintrittswahrscheinlichkeit -->
-                <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered">
-                  <button class="risk-chip {{ risk.residual_risk.likelihood|likelihood_class }}" type="button" aria-label="{% trans 'Likelihood' as likelihood_long_name %}">
-                    <span class="chip-head">{% trans "Probability of occurrence" %}</span>
+                {% if risk.residual_risk %}
+                <!-- Likelihood -->
+                <div class="column is-half">
+                  <button class="risk-chip {{ risk.residual_risk.likelihood|likelihood_class }}" type="button">
+                    <span class="chip-head">{% trans "Likelihood" %}</span>
                     <span class="chip-id">{{ risk.residual_risk.likelihood }}</span>
                     <span class="chip-label">{{ risk.residual_risk.get_likelihood_display }}</span>
                   </button>
                 </div>
 
-                <!-- Schadensausmaß -->
-                <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered">
-                  <button class="risk-chip {{ risk.residual_risk.impact|impact_class }}" type="button" aria-label="{% trans 'Impact' as impact_long_name %}">
-                    <span class="chip-head">{% trans "Extent of damage" %}</span>
+                <!-- Impact -->
+                <div class="column is-half">
+                  <button class="risk-chip {{ risk.residual_risk.impact|impact_class }}" type="button">
+                    <span class="chip-head">{% trans "Impact" %}</span>
                     <span class="chip-id">{{ risk.residual_risk.impact }}</span>
                     <span class="chip-label">{{ risk.residual_risk.get_impact_display }}</span>
                   </button>
                 </div>
 
-                <!-- Stufe -->
-                <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered">
-                  <button class="risk-chip {{ risk.residual_risk.level|level_class }}" type="button" aria-label="{% trans 'Level' %}">
+                <!-- Level -->
+                <div class="column is-half">
+                  <button class="risk-chip {{ risk.residual_risk.level|level_class }}" type="button">
                     <span class="chip-head">{% trans "Level" %}</span>
                     <span class="chip-id">{{ risk.residual_risk.level|level_id }}</span>
                     <span class="chip-label">{{ risk.residual_risk.level }}</span>
@@ -162,153 +142,124 @@
                 </div>
 
                 <!-- Score -->
-                <div class="column is-full-mobile is-full-tablet is-half-desktop has-text-centered" aria-label="{% trans 'Score' %}">
+                <div class="column is-half">
                   <button class="risk-chip {{ risk.residual_risk.score|score_class }}" type="button">
                     <span class="chip-head">{% trans "Score" %}</span>
                     <span class="chip-id">{{ risk.residual_risk.score }}</span>
-                    <span class="chip-label">(max. 20)</span>
+                    <span class="chip-label">Max. 20</span>
                   </button>
                 </div>
-              {% else %}
-                <p class="has-text-grey">{% trans "No net risk recorded yet." %}</p>
-              {% endif %}
-              </div><br>
-              {% if request.user.is_staff or risk.owner_id == request.user.id %}
-                <form method="post" action="{% url 'risks:update_residual_review' risk.id %}">
-                  {% csrf_token %}
-                  <label class="checkbox">
-                    <input type="checkbox" name="review_required" value="on" {% if risk.residual_risk and risk.residual_risk.review_required %}checked{% endif %}>
-                    {% trans "Review required" %}
-                  </label>
-                  <button class="button is-small is-link" style="margin-left:.5rem;">
-                    {% trans "Save" %}
-                  </button>
-                </form>
-              {% endif %}
+
+                {% else %}
+                  <p class="has-text-grey">{% trans "No net risk recorded yet." %}</p>
+                {% endif %}
+              </div>
             </div>
-          </div> <!-- Ende Nettorisiko -->
+          </div><!-- Net risk End -->
 
-        </div> <!-- Ende Risikobewertung -->
-    </div> <!-- Ende Inhalt Überblick -->
-  </div> <!-- Ende Überblick -->
-
-  <!-- Maßnahmen -->
-  <div class="card">
-    <header class="card-header">
-      <p class="card-header-title">{% trans "Measures" %}</p>
-    </header>
-    <div class="card-content">
-      {% if risk.controls.exists %}
-        <table class="table is-striped is-hoverable is-fullwidth">
-          <thead>
-            <tr>
-              <th>{% trans "Title" %}</th>
-              <th>{% trans "Status" %}</th>
-              <th>{% trans "Deadline" %}</th>
-              <th>{% trans "Responsible" %}</th>
-              <th>{% trans "Link" %}</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for control in risk.controls.all %}
-              <tr onclick="window.location.href='/risks/controls/{{ control.id }}';" style="cursor:pointer;">
-                <td>{{ control.title }}</td>
-                <td>{{ control.get_status_display }}</td>
-                <td>
-                  {% if control.due_date %}
-                    {{ control.due_date|date:"d.m.Y" }}
-                  {% else %}
-                    –
-                  {% endif %}
-                </td>
-                <td>
-                  {% if control.responsible %}
-                    {{ control.responsible.get_full_name|default:control.responsible.username }}
-                  {% else %}
-                    –
-                  {% endif %}
-                </td>
-                <td>
-                  {% if control.wiki_link %}
-                    <a href="{{ control.wiki_link }}" target="_blank">🔗</a>
-                  {% else %}
-                    –
-                  {% endif %}
-                </td>
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      {% else %}
-        <p class="has-text-grey">{% trans "No measures recorded." %}</p>
-      {% endif %}
+        </div><!-- Risk assessment End -->
+      </div>
     </div>
+  </div><!-- Overview Tab End -->
+
+<!-- Tab: Measures -->
+<div class="tab-panel is-hidden" data-tab="measures">
+  <div class="table-container">
+    <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
+      <thead>
+        <tr class="has-background-prosoft">
+          <th class="has-text-centered">{% trans "Title" %}</th>
+          <th class="has-text-centered">{% trans "Status" %}</th>
+          <th class="has-text-centered">{% trans "Deadline" %}</th>
+          <th class="has-text-centered">{% trans "Responsible" %}</th>
+          <th class="has-text-centered">{% trans "Link" %}</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for control in risk.controls.all %}
+        <tr onclick="window.location.href='/risks/controls/{{ control.id }}';" style="cursor:pointer;">
+          <td>{{ control.title }}</td>
+          <td class="has-text-centered">{{ control.get_status_display }}</td>
+          <td class="has-text-centered">{{ control.due_date|date:"d.m.Y"|default:"–" }}</td>
+          <td class="has-text-centered">{{ control.responsible.get_full_name|default:control.responsible.username|default:"–" }}</td>
+          <td class="has-text-centered">{% if control.wiki_link %}<a href="{{ control.wiki_link }}" target="_blank">🔗</a>{% else %}–{% endif %}</td>
+        </tr>
+        {% empty %}
+        <tr><td colspan="5" class="has-text-grey has-text-centered">{% trans "No measures recorded." %}</td></tr>
+        {% endfor %}
+      </tbody>
+    </table>
   </div>
-  <!-- Ende Maßnahmen -->
+</div><!-- Measures Tab End -->
 
-  <!-- Vorfälle -->
-  <div class="card">
-    <header class="card-header">
-      <p class="card-header-title">{% trans "Incidents" %}</p>
-    </header>
-    <div class="card-content">
-      {% if risk.incidents.exists %}
-        <table class="table is-striped is-fullwidth">
-          <thead>
-            <tr>
-              <th>{% trans "Incident" %}</th>
-              <th>{% trans "Status" %}</th>
-              <th>{% trans "Reported on" %}</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for i in risk.incidents.all %}
-              <tr onclick="window.location.href='/risks/incidents/{{ i.id }}';" style="cursor:pointer;">
-                <td>{{ i.title }}</td>
-                <td>{{ i.status }}</td>
-                <td>{{ i.created_at|date:"d.m.Y H:i" }}</td>
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      {% else %}
-        <p class="has-text-grey">{% trans "No incidents recorded." %}</p>
-      {% endif %}
-    </div>
-  </div> <!-- Ende Vorfälle -->
+<!-- Tab: Incidents -->
+<div class="tab-panel is-hidden" data-tab="incidents">
+  <div class="table-container">
+    <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
+      <thead>
+        <tr class="has-background-prosoft">
+          <th class="has-text-centered">{% trans "Incident" %}</th>
+          <th class="has-text-centered">{% trans "Status" %}</th>
+          <th class="has-text-centered">{% trans "Reported on" %}</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for i in risk.incidents.all %}
+        <tr onclick="window.location.href='/risks/incidents/{{ i.id }}';" style="cursor:pointer;">
+          <td>{{ i.title }}</td>
+          <td class="has-text-centered">{{ i.get_status_display }}</td>
+          <td class="has-text-centered">{{ i.created_at|date:"d.m.Y H:i" }}</td>
+        </tr>
+        {% empty %}
+        <tr><td colspan="3" class="has-text-grey has-text-centered">{% trans "No incidents recorded." %}</td></tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div><!-- Incidents Tab End -->
 
-  <!-- Historie -->
-  <div class="card">
-    <header class="card-header">
-      <p class="card-header-title">{% trans "History" %}</p>
-    </header>
-    <div class="card-content">
-      {% if logs %}
-        <table class="table is-striped is-fullwidth">
-          <thead>
-            <tr>
-              <th>{% trans "Time" %}</th>
-              <th>{% trans "User" %}</th>
-              <th>{% trans "Action" %}</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for log in logs %}
-              <tr>
-                <td>{{ log.action_time|date:"d.m.Y H:i" }}</td>
-                <td>{{ log.user.get_full_name|default:log.user.username }}</td>
-                <td>{{ log.get_change_message }}</td>
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      {% else %}
-        <p class="has-text-grey">{% trans "No History found." %}</p>
-      {% endif %}
-    </div>
-  </div> <!-- Ende Historie -->
+<!-- Tab: History -->
+<div class="tab-panel is-hidden" data-tab="history">
+  <div class="table-container">
+    <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
+      <thead>
+        <tr class="has-background-prosoft">
+          <th class="has-text-centered">{% trans "Time" %}</th>
+          <th class="has-text-centered">{% trans "User" %}</th>
+          <th class="has-text-centered">{% trans "Action" %}</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for log in logs %}
+        <tr>
+          <td class="has-text-centered">{{ log.action_time|date:"d.m.Y H:i" }}</td>
+          <td class="has-text-centered">{{ log.user.get_full_name|default:log.user.username }}</td>
+          <td>{{ log.get_change_message }}</td>
+        </tr>
+        {% empty %}
+        <tr><td colspan="3" class="has-text-grey has-text-centered">{% trans "No history found." %}</td></tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div><!-- History Tab End -->
 
-  <br><br>
-
-</div>
-{% endblock %}
\ No newline at end of file
+<!-- Tab switching script -->
+<script>
+document.addEventListener('DOMContentLoaded', () => {
+  const tabs   = document.querySelectorAll('.erp-tabs a[data-tab]');
+  const panels = document.querySelectorAll('.tab-panel');
+  tabs.forEach(tab => {
+    tab.addEventListener('click', e => {
+      e.preventDefault();
+      tabs.forEach(x => x.classList.remove('is-active'));
+      panels.forEach(p => p.classList.add('is-hidden'));
+      tab.classList.add('is-active');
+      const target = tab.getAttribute('data-tab');
+      const activePanel = document.querySelector(`.tab-panel[data-tab="${target}"]`);
+      if (activePanel) activePanel.classList.remove('is-hidden');
+    });
+  });
+});
+</script>
+{% endblock %}