diff --git a/src/style/organisms/character-tabs/_combat.scss b/src/style/organisms/character-tabs/_combat.scss
index adad410d..77878569 100644
--- a/src/style/organisms/character-tabs/_combat.scss
+++ b/src/style/organisms/character-tabs/_combat.scss
@@ -5,16 +5,39 @@
   grid-template-columns: 1fr 320px;
   grid-template-rows: 32px 32px 1fr;
   grid-template-areas: "res res" "wounds wounds"  "actions actions";
-  gap: 10px;
+  padding: 8px;
+  gap: 8px;
 
-  .tab-resources {
+  div.combatline {
     grid-area: res;
+    display: flex;
+    flex-direction: row;
+    justify-self: center;
+    height: unset;
+    padding: 0;
+    gap: 0 8px;
+
+
+    input {
+      width: 48px;
+      height: 32px;
+    }
+
+    span, label {
+      line-height: 32px;
+      height: 32px;
+      vertical-align: middle;
+    }
+
   }
 
   .wounds {
     position: relative;
     height: 24px;
     display: flex;
+    flex-direction: unset;
+    gap: unset;
+    padding: unset;
     margin-bottom: 8px;
     padding-left: 130px;
     grid-area: wounds;
@@ -69,8 +92,14 @@
 
   .actions {
     grid-area: actions;
+    padding: 0;
+
+    .grid-of-actions {
+      display: unset;
+    }
   }
 
+
   &.zones {
     grid-template-areas: "res res" "wounds wounds"  "actions paperdoll";
 
diff --git a/src/templates/actor/character/tab-combat.hbs b/src/templates/actor/character/tab-combat.hbs
index ab59267e..6e86390f 100644
--- a/src/templates/actor/character/tab-combat.hbs
+++ b/src/templates/actor/character/tab-combat.hbs
@@ -2,7 +2,7 @@
          data-tab="{{tabs.combat.id}}"
          data-group="{{tabs.combat.group}}">
 
-    <div class="tab-resources">
+    <div class="combatline">
 
         <div class="initiaitve">
             <label>Initiative:</label>
@@ -12,16 +12,16 @@
         </div>
         <div class="lebensenergie">
             <label>Lebensenergie:</label>
-            <input type="number" name="system.lep.aktuell" value="{{actor.system.lep.aktuell}}"/>
+            <input type="number" name="system.lep.aktuell" value="{{this.system.lep.aktuell}}"/>
             <span class="inline">von</span>
-            <input type="number" disabled value="{{actor.system.lep.max}}"/>
+            <input type="number" disabled value="{{this.system.lep.max}}"/>
         </div>
         {{#if ausdauer}}
             <div class="ausdauer">
                 <label>Ausdauerpunkte:</label>
-                <input type="number" name="system.aup.aktuell" value="{{actor.system.aup.aktuell}}"/>
+                <input type="number" name="system.aup.aktuell" value="{{this.system.aup.aktuell}}"/>
                 <span class="inline">von</span>
-                <input type="number" disabled value="{{actor.system.aup.max}}"/>
+                <input type="number" disabled value="{{this.system.aup.max}}"/>
             </div>
         {{/if}}
         {{#if (not zonenruestung)}}
@@ -54,9 +54,11 @@
 
     <div class="actions">
         <h3>Aktionen im Kampf</h3>
+        <div class="grid-of-actions">
         {{#each this.actions}}
             {{> "systems/DSA_4-1/templates/ui/partial-action-button.hbs" this}}
         {{/each}}
+        </div>
     </div>
 
     {{#if (or trefferzonen zonenruestung)}}