diff --git a/Aborea_new/aborea.css b/Aborea_new/aborea.css
index 918de0b962..08d6445443 100644
--- a/Aborea_new/aborea.css
+++ b/Aborea_new/aborea.css
@@ -1 +1 @@
-.sheet-container{width:870px}.sheet-container input{background:transparent;width:100%;border:1px solid #ddd;border-radius:3px;}.sheet-container select{background:transparent;width:100%;border:1px solid #ddd;border-radius:3px;}.sheet-container input[type=number]{text-align:center;-moz-appearance:textfield;-webkit-appearance:textfield;}.sheet-container input[type=checkbox]{width:auto;}.sheet-container textarea{margin:0;width:100%;height:65px;resize:vertical;box-sizing:border-box;border:1px solid #ddd;border-radius:3px;}.sheet-container select{margin:0;}.sheet-container span{text-transform:uppercase;}.sheet-container label{width:auto;display:block;margin-top:-19px;margin-bottom:0;font-weight:normal;padding:0;font-size:15px;}.sheet-container .sheet-input_label{cursor:pointer;}.sheet-container .sheet-redbg{background-color:red;color:white;border:1px solid red;border-bottom:1px solid white;font-weight:bold;padding-left:5px;}.sheet-container strong{font-weight:900;}.sheet-container .sheet-textcenter{text-align:center;}.sheet-container .sheet-float{float:left;box-sizing:border-box;width:99%;margin:10px 5px 10px 0;}.sheet-container .sheet-noborder{border:none;}.sheet-container .sheet-half{max-width:49%;}.sheet-container .sheet-twice{display:grid;grid-template-columns:49% 49%;grid-gap:5px;}.sheet-container .sheet-clear{clear:both;overflow:auto;}.sheet-container .sheet-row{padding-top:30px;}.sheet-container .sheet-row.sheet-small{padding-top:10px;}.sheet-container .sheet-row:first-child{padding-top:0;}.sheet-container .sheet-grid,.sheet-container .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem{display:grid;grid-gap:5px;}.sheet-container .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem{margin-top:5px;}.sheet-container .sheet-grid>div{background-color:#f00;color:#FFF;font-weight:bold;text-align:center;}.sheet-container .sheet-gridplace .repcontainer .repitem input,.sheet-container .sheet-gridplace .repcontainer .repitem select,.sheet-container .sheet-gridplace .repcontainer .repitem button,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem input,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem select,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem button{width:-webkit-fill-available;width:-moz-available;}.sheet-container .sheet-gridplace .repcontainer .repitem button.repcontrol_del{width:auto;}.sheet-container .sheet-gridplace .repcontainer .repitem div,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem div{margin:auto 0;text-align:center;}.sheet-container .sheet-switch{position:relative;display:inline-block;width:40px;height:24px;}.sheet-container .sheet-switch input{opacity:0;width:0;height:0;}.sheet-container .sheet-slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s;}.sheet-container .sheet-slider:before{position:absolute;content:"";height:16px;width:16px;left:4px;bottom:4px;background-color:white;-webkit-transition:.4s;transition:.4s;}.sheet-container input:checked + .sheet-slider{background-color:#f00;}.sheet-container input:focus + .sheet-slider{box-shadow:0 0 1px #f00;}.sheet-container input:checked + .sheet-slider:before{-webkit-transform:translateX(16px);-ms-transform:translateX(16px);transform:translateX(16px);}.sheet-container .sheet-main .sheet-ep{width:190px;float:left;}.sheet-container .sheet-main .sheet-ep input,.sheet-container .sheet-main .sheet-ep label{float:left;margin-right:5px;}.sheet-container .sheet-main .sheet-ep input:last-child,.sheet-container .sheet-main .sheet-ep label:last-child{margin-right:0;}.sheet-container .sheet-main .sheet-ep input{width:50px;height:40px;}.sheet-container .sheet-main .sheet-ep label[for="sheet-Stufe"],.sheet-container .sheet-main .sheet-ep label[for="sheet-AP"]{width:50px;text-align:center;}.sheet-container .sheet-main .sheet-ep input[name="attr_ep"],.sheet-container .sheet-main .sheet-ep label[for="attr_ep"]{width:80px;text-align:center;}.sheet-container .sheet-main .sheet-vermoegen{width:210px;float:right;padding-top:0;}.sheet-container .sheet-main .sheet-vermoegen div{width:100%;}.sheet-container .sheet-main .sheet-vermoegen input,.sheet-container .sheet-main .sheet-vermoegen label{float:left;margin-left:5px;}.sheet-container .sheet-main .sheet-vermoegen input:first-child,.sheet-container .sheet-main .sheet-vermoegen label:first-child{margin-left:0;}.sheet-container .sheet-main .sheet-vermoegen input{width:40px;height:40px;}.sheet-container .sheet-main .sheet-vermoegen label[for="attr_tt"],.sheet-container .sheet-main .sheet-vermoegen label[for="attr_kl"],.sheet-container .sheet-main .sheet-vermoegen label[for="attr_mu"]{width:40px;text-align:center;}.sheet-container .sheet-main .sheet-vermoegen input[name="attr_gf"],.sheet-container .sheet-main .sheet-vermoegen label[for="attr_gf"]{width:70px;text-align:center;}.sheet-container .sheet-main .sheet-stats{width:210px;float:left;}.sheet-container .sheet-main .sheet-stats>input,.sheet-container .sheet-main .sheet-stats>label,.sheet-container .sheet-main .sheet-stats>div{float:left;margin-right:5px;}.sheet-container .sheet-main .sheet-stats input:last-child,.sheet-container .sheet-main .sheet-stats label:last-child,.sheet-container .sheet-main .sheet-stats div:last-child{margin-right:0;}.sheet-container .sheet-main .sheet-stats label[for="attr_leben"]{text-align:center;float:none;width:110px;}.sheet-container .sheet-main .sheet-stats input{width:50px;height:40px;}.sheet-container .sheet-main .sheet-gmroll{width:210px;float:right;}.sheet-container .sheet-main .sheet-gmroll select{float:right;width:175px;}.sheet-container .sheet-main .sheet-beruf select[name=attr_beruf]{display:none;}.sheet-container .sheet-main .sheet-beruf .sheet-switch{float:right;position:relative;height:17px;border:1px solid #ccc;}.sheet-container .sheet-main .sheet-beruf .sheet-switch .sheet-slider{box-shadow:none;}.sheet-container .sheet-main .sheet-beruf .sheet-switch .sheet-slider:before{height:13px;bottom:2px;}.sheet-container .sheet-main .sheet-beruf input[name=attr_toggle_beruf]:checked ~ input{display:none;}.sheet-container .sheet-main .sheet-beruf input[name=attr_toggle_beruf]:checked ~ select{display:inherit;}.sheet-container .sheet-main .sheet-settings{padding-top:10px;display:grid;grid-template-columns:49% 49%;grid-gap:5px;}.sheet-container .sheet-main .sheet-gott{width:180px;float:left;}.sheet-container .sheet-main .sheet-gott div{width:auto;margin-left:20px;}.sheet-container .sheet-main .sheet-gott input{width:auto;margin-left:10px;}.sheet-container .sheet-main .sheet-gott input[name="attr_1"]{margin-left:35px;}.sheet-container .sheet-main .sheet-mana{width:135px;float:right;margin-top:10px;}.sheet-container .sheet-main .sheet-mana label{text-align:center;}.sheet-container .sheet-main .sheet-mana input{width:60px;height:40px;}.sheet-container .sheet-main .sheet-magie .sheet-grid,.sheet-container .sheet-main .sheet-magie .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-main .sheet-magie .sheet-gridplace .sheet-repcontainer .sheet-repitem{grid-template-columns:220px 70px 70px 50px;}.sheet-container .sheet-main .sheet-attribut .sheet-grid,.sheet-container .sheet-main .sheet-attribut .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-main .sheet-attribut .sheet-gridplace .sheet-repcontainer .sheet-repitem{grid-template-columns:220px 70px 22px 42px 50px;}.sheet-container .sheet-main .sheet-attribut .sheet-arrow{border-top:10px solid transparent;border-bottom:10px solid transparent;border-left:20px solid #f00;width:auto;height:auto;margin:6px 0;margin-right:60px;}.sheet-container .sheet-main .sheet-attribut label{position:relative;left:-95px;top:7px;}.sheet-container .sheet-main .sheet-fertigkeiten .sheet-grid,.sheet-container .sheet-main .sheet-fertigkeiten .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-main .sheet-fertigkeiten .sheet-gridplace .sheet-repcontainer .sheet-repitem{grid-template-columns:220px 70px 70px 50px;}.sheet-container .sheet-main .sheet-kampf .sheet-grid,.sheet-container .sheet-main .sheet-kampf .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-main .sheet-kampf .sheet-gridplace .sheet-repcontainer .sheet-repitem{grid-template-columns:229px 70px 140px 70px 70px 70px 70px 50px 50px;}.sheet-container .sheet-main .sheet-inventar{display:inherit;}.sheet-container .sheet-main .sheet-inventar .sheet-rustung{padding-bottom:4px;}.sheet-container .sheet-main .sheet-inventar input:first-child{width:250px;}.sheet-container .sheet-main .sheet-inventar input{width:84px;}.sheet-container .sheet-main .sheet-inventar .sheet-switch{float:right;position:relative;top:19px;height:17px;border:1px solid #ccc;}.sheet-container .sheet-main .sheet-inventar .sheet-switch .sheet-slider{box-shadow:none;}.sheet-container .sheet-main .sheet-inventar .sheet-switch .sheet-slider:before{height:13px;bottom:2px;}.sheet-container .sheet-main .sheet-inventar input[name=attr_show_textbox] ~ div textarea{display:none;}.sheet-container .sheet-main .sheet-inventar input[name=attr_show_textbox]:checked ~ div textarea{display:inline-block;}
\ No newline at end of file
+.sheet-container{width:870px}.sheet-container input{background:transparent;width:100%;border:1px solid #ddd;border-radius:3px;}.sheet-container select{background:transparent;width:100%;border:1px solid #ddd;border-radius:3px;}.sheet-container input[type=number]{text-align:center;-moz-appearance:textfield;-webkit-appearance:textfield;}.sheet-container input[type=checkbox]{width:auto;}.sheet-container textarea{margin:0;width:100%;height:65px;resize:vertical;box-sizing:border-box;border:1px solid #ddd;border-radius:3px;}.sheet-container select{margin:0;}.sheet-container span{text-transform:uppercase;}.sheet-container label{width:auto;display:block;margin-top:-19px;margin-bottom:0;font-weight:normal;padding:0;font-size:15px;}.sheet-container .sheet-input_label{cursor:pointer;}.sheet-container .sheet-redbg{background-color:red;color:white;border:1px solid red;border-bottom:1px solid white;font-weight:bold;padding-left:5px;}.sheet-container strong{font-weight:900;}.sheet-container .sheet-textcenter{text-align:center;}.sheet-container .sheet-float{float:left;box-sizing:border-box;width:99%;margin:10px 5px 10px 0;}.sheet-container .sheet-noborder{border:none;}.sheet-container .sheet-half{max-width:49%;}.sheet-container .sheet-twice{display:grid;grid-template-columns:49% 49%;grid-gap:5px;}.sheet-container .sheet-clear{clear:both;overflow:auto;}.sheet-container .sheet-row{padding-top:30px;}.sheet-container .sheet-row.sheet-small{padding-top:10px;}.sheet-container .sheet-row:first-child{padding-top:0;}.sheet-container .sheet-grid,.sheet-container .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem{display:grid;grid-gap:5px;}.sheet-container .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem{margin-top:5px;}.sheet-container .sheet-grid>div{background-color:#f00;color:#FFF;font-weight:bold;text-align:center;}.sheet-container .sheet-gridplace .repcontainer .repitem input,.sheet-container .sheet-gridplace .repcontainer .repitem select,.sheet-container .sheet-gridplace .repcontainer .repitem button,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem input,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem select,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem button{width:-webkit-fill-available;width:-moz-available;}.sheet-container .sheet-gridplace .repcontainer .repitem button.repcontrol_del{width:auto;}.sheet-container .sheet-gridplace .repcontainer .repitem div,.sheet-container .sheet-gridplace .sheet-repcontainer .sheet-repitem div{margin:auto 0;text-align:center;}.sheet-container .sheet-switch{position:relative;display:inline-block;width:40px;height:24px;}.sheet-container .sheet-switch input{opacity:0;width:0;height:0;}.sheet-container .sheet-slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s;}.sheet-container .sheet-slider:before{position:absolute;content:"";height:16px;width:16px;left:4px;bottom:4px;background-color:white;-webkit-transition:.4s;transition:.4s;}.sheet-container input:checked + .sheet-slider{background-color:#f00;}.sheet-container input:focus + .sheet-slider{box-shadow:0 0 1px #f00;}.sheet-container input:checked + .sheet-slider:before{-webkit-transform:translateX(16px);-ms-transform:translateX(16px);transform:translateX(16px);}.sheet-container .sheet-main .sheet-ep{width:190px;float:left;}.sheet-container .sheet-main .sheet-ep input,.sheet-container .sheet-main .sheet-ep label{float:left;margin-right:5px;}.sheet-container .sheet-main .sheet-ep input:last-child,.sheet-container .sheet-main .sheet-ep label:last-child{margin-right:0;}.sheet-container .sheet-main .sheet-ep input{width:50px;height:40px;}.sheet-container .sheet-main .sheet-ep label[for="sheet-Stufe"],.sheet-container .sheet-main .sheet-ep label[for="sheet-AP"]{width:50px;text-align:center;}.sheet-container .sheet-main .sheet-ep input[name="attr_ep"],.sheet-container .sheet-main .sheet-ep label[for="attr_ep"]{width:80px;text-align:center;}.sheet-container .sheet-main .sheet-vermoegen{width:210px;float:right;padding-top:0;}.sheet-container .sheet-main .sheet-vermoegen div{width:100%;}.sheet-container .sheet-main .sheet-vermoegen input,.sheet-container .sheet-main .sheet-vermoegen label{float:left;margin-left:5px;}.sheet-container .sheet-main .sheet-vermoegen input:first-child,.sheet-container .sheet-main .sheet-vermoegen label:first-child{margin-left:0;}.sheet-container .sheet-main .sheet-vermoegen input{width:40px;height:40px;}.sheet-container .sheet-main .sheet-vermoegen label[for="attr_tt"],.sheet-container .sheet-main .sheet-vermoegen label[for="attr_kl"],.sheet-container .sheet-main .sheet-vermoegen label[for="attr_mu"]{width:40px;text-align:center;}.sheet-container .sheet-main .sheet-vermoegen input[name="attr_gf"],.sheet-container .sheet-main .sheet-vermoegen label[for="attr_gf"]{width:70px;text-align:center;}.sheet-container .sheet-main .sheet-stats{width:210px;float:left;}.sheet-container .sheet-main .sheet-stats>input,.sheet-container .sheet-main .sheet-stats>label,.sheet-container .sheet-main .sheet-stats>div{float:left;margin-right:5px;}.sheet-container .sheet-main .sheet-stats input:last-child,.sheet-container .sheet-main .sheet-stats label:last-child,.sheet-container .sheet-main .sheet-stats div:last-child{margin-right:0;}.sheet-container .sheet-main .sheet-stats label[for="attr_leben"]{text-align:center;float:none;width:110px;}.sheet-container .sheet-main .sheet-stats input{width:50px;height:40px;}.sheet-container .sheet-main .sheet-gmroll{width:210px;float:right;}.sheet-container .sheet-main .sheet-gmroll select{float:right;width:175px;}.sheet-container .sheet-main .sheet-beruf select[name=attr_beruf]{display:none;}.sheet-container .sheet-main .sheet-beruf .sheet-switch{float:right;position:relative;height:17px;border:1px solid #ccc;}.sheet-container .sheet-main .sheet-beruf .sheet-switch .sheet-slider{box-shadow:none;}.sheet-container .sheet-main .sheet-beruf .sheet-switch .sheet-slider:before{height:13px;bottom:2px;}.sheet-container .sheet-main .sheet-beruf input[name=attr_toggle_beruf]:checked ~ input{display:none;}.sheet-container .sheet-main .sheet-beruf input[name=attr_toggle_beruf]:checked ~ select{display:inherit;}.sheet-container .sheet-main .sheet-settings{padding-top:10px;display:grid;grid-template-columns:49% 49%;grid-gap:5px;}.sheet-container .sheet-main .sheet-gott{width:180px;float:left;}.sheet-container .sheet-main .sheet-gott div{width:auto;margin-left:20px;}.sheet-container .sheet-main .sheet-gott input{width:auto;margin-left:10px;}.sheet-container .sheet-main .sheet-gott input[name="attr_1"]{margin-left:35px;}.sheet-container .sheet-main .sheet-mana{width:135px;float:right;margin-top:10px;}.sheet-container .sheet-main .sheet-mana label{text-align:center;}.sheet-container .sheet-main .sheet-mana input{width:60px;height:40px;}.sheet-container .sheet-main .sheet-magie .sheet-grid,.sheet-container .sheet-main .sheet-magie .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-main .sheet-magie .sheet-gridplace .sheet-repcontainer .sheet-repitem{grid-template-columns:220px 70px 70px 50px;}.sheet-container .sheet-main .sheet-attribut .sheet-grid,.sheet-container .sheet-main .sheet-attribut .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-main .sheet-attribut .sheet-gridplace .sheet-repcontainer .sheet-repitem{grid-template-columns:220px 70px 22px 42px 50px;}.sheet-container .sheet-main .sheet-attribut .sheet-arrow{border-top:10px solid transparent;border-bottom:10px solid transparent;border-left:20px solid #f00;width:auto;height:auto;margin:6px 0;margin-right:60px;}.sheet-container .sheet-main .sheet-attribut label{position:relative;left:-95px;top:7px;}.sheet-container .sheet-main .sheet-fertigkeiten .sheet-grid,.sheet-container .sheet-main .sheet-fertigkeiten .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-main .sheet-fertigkeiten .sheet-gridplace .sheet-repcontainer .sheet-repitem{grid-template-columns:220px 70px 70px 50px;}.sheet-container .sheet-main .sheet-kampf .sheet-grid,.sheet-container .sheet-main .sheet-kampf .sheet-gridplace .repcontainer .repitem,.sheet-container .sheet-main .sheet-kampf .sheet-gridplace .sheet-repcontainer .sheet-repitem{grid-template-columns:303px 70px 140px 70px 70px 70px 50px 50px;}.sheet-container .sheet-main .sheet-inventar{display:inherit;}.sheet-container .sheet-main .sheet-inventar input:first-child{width:250px;}.sheet-container .sheet-main .sheet-inventar input{width:84px;}.sheet-container .sheet-main .sheet-inventar,.sheet-container .sheet-main .sheet-notes{display:inherit;}.sheet-container .sheet-main .sheet-inventar .sheet-switch,.sheet-container .sheet-main .sheet-notes .sheet-switch{float:right;position:relative;top:19px;height:17px;border:1px solid #ccc;}.sheet-container .sheet-main .sheet-inventar .sheet-switch .sheet-slider,.sheet-container .sheet-main .sheet-notes .sheet-switch .sheet-slider{box-shadow:none;}.sheet-container .sheet-main .sheet-inventar .sheet-switch .sheet-slider:before,.sheet-container .sheet-main .sheet-notes .sheet-switch .sheet-slider:before{height:13px;bottom:2px;}.sheet-container .sheet-main .sheet-inventar input[name=attr_show_inventar] ~ div textarea,.sheet-container .sheet-main .sheet-notes input[name=attr_show_inventar] ~ div textarea{display:none;}.sheet-container .sheet-main .sheet-inventar input[name=attr_show_inventar]:checked ~ div textarea,.sheet-container .sheet-main .sheet-notes input[name=attr_show_inventar]:checked ~ div textarea{display:inline-block;}.sheet-container .sheet-main .sheet-inventar input[name=attr_show_notes] ~ div textarea,.sheet-container .sheet-main .sheet-notes input[name=attr_show_notes] ~ div textarea{display:none;}.sheet-container .sheet-main .sheet-inventar input[name=attr_show_notes]:checked ~ div textarea,.sheet-container .sheet-main .sheet-notes input[name=attr_show_notes]:checked ~ div textarea{display:inline-block;}
\ No newline at end of file
diff --git a/Aborea_new/aborea.html b/Aborea_new/aborea.html
index f6ef6f0c99..bde311c531 100644
--- a/Aborea_new/aborea.html
+++ b/Aborea_new/aborea.html
@@ -370,7 +370,6 @@
                 <div>Attribut</div>
                 <div>Fertigkeit</div>
                 <div>KB</div>
-                <div>OB</div>
                 <div>Schaden</div>
                 <div>Ini-Bonus</div>
                 <div>Init.</div>
@@ -387,14 +386,13 @@
                     <div><input class="sheet-textcenter" type="text" name="attr_kampf_fertigkeit"
                             placeholder="Kurze Klingenwaffe" /></div>
                     <div><input type="number" name="attr_kampf_kb" value="0" /></div>
-                    <div><input type="number" name="attr_kampf_ob" value="0" /></div>
                     <div><input type="number" name="attr_kampf_schaden" value="0" /></div>
                     <div><input type="number" name="attr_kampf_inib" value="0" /></div>
                     <div><button type="roll" name="roll_kampf_init"
                             value="@{abilityroll} nutzt @{kampf_waffenname} mit einer Initiative von [[@{geb} + @{kampf_inib} &{tracker}]]"></button>
                     </div>
                     <div><button type="roll" name="roll_kampf_angr"
-                            value="@{abilityroll} greift mit @{kampf_waffenname} an würfelt eine [[1d10! + @{kampf_ob} + ?{Kampf-Modifier?|0}]] mit [[@{kampf_schaden} + ?{Schaden-Modifier?|0}]] Schaden. Der DB beträgt [[floor(@{kampf_KB}-@{kampf_OB})]]"></button>
+                            value="@{abilityroll} greift mit @{kampf_waffenname} an würfelt eine [[1d10! + ?{Offensivbonus?|@{kampf_kb}} + ?{Kampf-Modifier?|0}]] mit [[@{kampf_schaden} + ?{Schaden-Modifier?|0}]] Schaden. Der DB beträgt [[floor(@{kampf_KB}-?{Offensivbonus?})]]"></button>
                     </div>
                 </fieldset>
             </div>
@@ -404,15 +402,27 @@
 
         <div class="sheet-float sheet-half sheet-inventar">
             <label class="sheet-switch">
-                <input type="checkbox" name="attr_show_textbox" value="1" checked />
+                <input type="checkbox" name="attr_show_inventar" value="1" checked />
                 <span class="sheet-slider"></span>
             </label>
-            <input style="display: none;" type="checkbox" name="attr_show_textbox" value="1" />
+            <input style="display: none;" type="checkbox" name="attr_show_inventar" value="1" />
             <div class="sheet-redbg">Inventar</div>
+            <div class="sheet-options sheet-inventar-row">
+                <input type="text" name="attr_ruestung1" placeholder="Rüstung" />
+                <input type="number" name="attr_ruestung1_ruestwert" placeholder="Rüstwert" />
+                <input type="number" name="attr_ruestung1_manoever" placeholder="Manöver" />
+                <textarea name="attr_ruestung1_description" placeholder="Beschreibung"></textarea>
+            </div>
+            <div class="sheet-options sheet-inventar-row">
+                <input type="text" name="attr_ruestung2" placeholder="Rüstung" />
+                <input type="number" name="attr_ruestung2_ruestwert" placeholder="Rüstwert" />
+                <input type="number" name="attr_ruestung2_manoever" placeholder="Manöver" />
+                <textarea name="attr_ruestung2_description" placeholder="Beschreibung"></textarea>
+            </div>
             <fieldset class="repeating_inventar">
                 <div class="sheet-options sheet-inventar-row">
                     <input type="text" name="attr_name" placeholder="Gegenstand" />
-                    <input type="text" name="attr_wight" placeholder="Gewicht" />
+                    <input type="text" name="attr_wight" placeholder="Info" />
                     <input type="number" name="attr_costs" placeholder="Anzahl" />
                     <textarea name="attr_description" placeholder="Beschreibung"></textarea>
                 </div>
@@ -420,6 +430,11 @@
         </div>
 
         <div class="sheet-float sheet-half sheet-notes">
+            <label class="sheet-switch">
+                <input type="checkbox" name="attr_show_notes" value="1" checked />
+                <span class="sheet-slider"></span>
+            </label>
+            <input style="display: none;" type="checkbox" name="attr_show_notes" value="1" />
             <div class="sheet-redbg">Notizen</div>
             <fieldset class="repeating_notes">
                 <div class="sheet-options sheet-notes-row">
@@ -691,17 +706,17 @@
                     leben_max: Math.floor((4 + kob) * stufe)
                 });
             }
-            if (beruf == "Barde" || beruf == "Dieb" || beruf == "Schamane" && calcleben == 1) {
+            if (beruf == "Barde" && calcleben == 1 || beruf == "Dieb" && calcleben == 1 || beruf == "Schamane" && calcleben == 1) {
                 setAttrs({
                     leben_max: Math.floor((6 + kob) * stufe)
                 });
             }
-            if (beruf == "Priester" || beruf == "Waldläufer" && calcleben == 1) {
+            if (beruf == "Priester" && calcleben == 1 || beruf == "Waldläufer" && calcleben == 1) {
                 setAttrs({
                     leben_max: Math.floor((8 + kob) * stufe)
                 });
             }
-            if (beruf == "Krieger" && calcleben == 1) {
+            if (beruf == "Krieger" && calcleben == 1 && calcleben == 1) {
                 setAttrs({
                     leben_max: Math.floor((10 + kob) * stufe)
                 });
@@ -716,12 +731,12 @@
             let inb = parseInt(values.inb) || 0;
             let chb = parseInt(values.chb) || 0;
             let mag = parseInt(values.mag) || 0;
-            if (beruf == "Dieb" || beruf == "Krieger" || beruf == "Waldläufer" || beruf == "Zauberer" && calcmana == 1) {
+            if (beruf == "Dieb" && calcmana == 1 || beruf == "Krieger" && calcmana == 1 || beruf == "Waldläufer" && calcmana == 1 || beruf == "Zauberer" && calcmana == 1) {
                 setAttrs({
                     mana_max: Math.floor((inb + 3) * mag)
                 });
             }
-            if (beruf == "Barde" || beruf == "Priester" || beruf == "Schamane" && calcmana == 1) {
+            if (beruf == "Barde" && calcmana == 1 || beruf == "Priester" && calcmana == 1 || beruf == "Schamane" && calcmana == 1) {
                 setAttrs({
                     mana_max: Math.floor((chb + 3) * mag)
                 });
diff --git a/Aborea_new/aborea.less b/Aborea_new/aborea.less
index 322fdcdccb..30f45d0943 100644
--- a/Aborea_new/aborea.less
+++ b/Aborea_new/aborea.less
@@ -443,17 +443,13 @@
             .sheet-grid,
             .sheet-gridplace .repcontainer .repitem,
             .sheet-gridplace .sheet-repcontainer .sheet-repitem {
-                grid-template-columns: 229px 70px 140px 70px 70px 70px 70px 50px 50px;
+                grid-template-columns: 303px 70px 140px 70px 70px 70px 50px 50px;
             }
         }
 
         .sheet-inventar {
             display: inherit;
 
-            .sheet-rustung {
-                padding-bottom: 4px;
-            }
-
             input:first-child {
                 width: 250px;
             }
@@ -461,6 +457,11 @@
             input {
                 width: 84px;
             }
+        }
+
+        .sheet-inventar,
+        .sheet-notes {
+            display: inherit;
 
             .sheet-switch {
                 float   : right;
@@ -479,7 +480,24 @@
                 }
             }
 
-            input[name=attr_show_textbox] {
+            input[name=attr_show_inventar] {
+
+                ~div {
+                    textarea {
+                        display: none;
+                    }
+                }
+
+                &:checked {
+                    ~div {
+                        textarea {
+                            display: inline-block;
+                        }
+                    }
+                }
+            }
+
+            input[name=attr_show_notes] {
 
                 ~div {
                     textarea {