diff --git a/less/original/apps.less b/less/original/apps.less
index d123b6ec..34a2d302 100644
--- a/less/original/apps.less
+++ b/less/original/apps.less
@@ -421,7 +421,7 @@
       }
       .item-name {
         padding-left: 5px;
-        .modesto();
+        //.modesto();
         font-size: 16px;
       }
     }
diff --git a/sw5e.css b/sw5e.css
index 426fe368..8328f03d 100644
--- a/sw5e.css
+++ b/sw5e.css
@@ -461,9 +461,7 @@
 }
 .sw5e.sheet .items-list .items-header .item-name {
   padding-left: 5px;
-  font-family: 'Russo One';
-  font-size: 14px;
-  font-weight: 400;
+  font-size: 16px;
 }
 .sw5e.sheet .items-list .item-name {
   flex: 2;
@@ -1060,9 +1058,7 @@
   overflow-y: auto;
 }
 .sw5e.sheet.item {
-  min-height: 400px;
-  max-height: 95%;
-  min-width: 480px;
+  min-height: 420px;
   /* ----------------------------------------- */
   /*  Sheet Header                             */
   /* ----------------------------------------- */
@@ -1083,7 +1079,7 @@
   border: 2px solid #000;
 }
 .sw5e.sheet.item .sheet-header .item-subtitle {
-  flex: 0 0 100px;
+  flex: 0 0 80px;
   height: 60px;
   margin: 0;
   padding: 5px;
@@ -1538,3 +1534,30 @@
   max-width: 40px;
   text-align: right;
 }
+input[type="number"] {
+  width: calc(100% - 2px);
+  min-width: 20px;
+  height: 26px;
+  background: rgba(0, 0, 0, 0.05);
+  padding: 1px 3px;
+  margin: 0;
+  color: #191813;
+  font-family: inherit;
+  font-size: inherit;
+  text-align: inherit;
+  line-height: inherit;
+  border: 1px solid #7a7971;
+  border-radius: 3px;
+  -webkit-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
+  -moz-appearance: textfield;
+}
+input[type="number"]:focus {
+  box-shadow: 0 0 5px red;
+}
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+}
diff --git a/templates/actors/newActor/npc-sheet.html b/templates/actors/newActor/npc-sheet.html
index 05672ee6..810e99f7 100644
--- a/templates/actors/newActor/npc-sheet.html
+++ b/templates/actors/newActor/npc-sheet.html
@@ -1,26 +1,26 @@
 <form class="{{cssClass}} swalt-sheet" autocomplete="off">
 
-  {{!-- NPC Sheet Header --}}
-  <header class="panel">
-      <img class="profile" src="{{actor.img}}" title="{{actor.name}}" data-edit="img"/>
-      <h1 class="character-name">
-        <input name="name" type="text" value="{{actor.name}}" placeholder="{{ localize 'SW5E.Name' }}" />
-      </h1>
-      <div class="level-experience">
+    {{!-- NPC Sheet Header --}}
+    <header class="panel">
+        <img class="profile" src="{{actor.img}}" title="{{actor.name}}" data-edit="img" />
+        <h1 class="character-name">
+            <input name="name" type="text" value="{{actor.name}}" placeholder="{{ localize 'SW5E.Name' }}" />
+        </h1>
+        <div class="level-experience">
             <div class="charlevel">
-              {{ localize "SW5E.AbbreviationCR" }}
-              <input name="data.details.cr" type="text" value="{{labels.cr}}" placeholder="1"/>
+                {{ localize "SW5E.AbbreviationCR" }}
+                <input name="data.details.cr" type="text" value="{{labels.cr}}" placeholder="1" />
             </div>
-            
+
             <div class="experience">
-              <span class="max">{{data.details.xp.value}} XP</span>
+                <span class="max">{{data.details.xp.value}} XP</span>
             </div>
-            
-          </div>
-      <section class="header-details flexrow" style="display: none;">
-          
-          
-          <!-- <aside class="header-exp flexcol">
+
+        </div>
+        <section class="header-details flexrow" style="display: none;">
+
+
+            <!-- <aside class="header-exp flexcol">
               <div class="cr">
                   <label>{{ localize "SW5E.AbbreviationCR" }}</label>
                   <input name="data.details.cr" type="text" value="{{labels.cr}}" placeholder="1"/>
@@ -30,153 +30,171 @@
               </div>
           </aside> -->
 
-          {{!-- Character Summary --}}
-          <ul class="summary flexrow">
-              <li>
-                  <span>{{lookup config.actorSizes data.traits.size}}</span>
-              </li>
-              <li>
-                  <input type="text" name="data.details.alignment" value="{{data.details.alignment}}" placeholder="{{ localize 'SW5E.Alignment' }}"/>
-              </li>
-              <li>
-                  <input type="text" name="data.details.type" value="{{data.details.type}}" placeholder="{{ localize 'SW5E.Type' }}"/>
-              </li>
-              <li>
-                  <input type="text" name="data.details.source" value="{{data.details.source}}" placeholder="{{ localize 'SW5E.Source' }}"/>
-              </li>
-          </ul>
+            {{!-- Character Summary --}}
+            <ul class="summary flexrow">
+                <li>
+                    <span>{{lookup config.actorSizes data.traits.size}}</span>
+                </li>
+                <li>
+                    <input type="text" name="data.details.alignment" value="{{data.details.alignment}}"
+                        placeholder="{{ localize 'SW5E.Alignment' }}" />
+                </li>
+                <li>
+                    <input type="text" name="data.details.type" value="{{data.details.type}}"
+                        placeholder="{{ localize 'SW5E.Type' }}" />
+                </li>
+                <li>
+                    <input type="text" name="data.details.source" value="{{data.details.source}}"
+                        placeholder="{{ localize 'SW5E.Source' }}" />
+                </li>
+            </ul>
 
-          {{!-- Header Attributes --}}
-          <ul class="attributes flexrow">
-             <li class="attribute health">
-                  <h4 class="attribute-name box-title rollable">{{ localize "SW5E.Health" }}</h4>
-                  <div class="attribute-value multiple">
-                      <input name="data.attributes.hp.value" type="text" value="{{data.attributes.hp.value}}" placeholder="10" data-dtype="Number"/>
-                      <span class="sep"> / </span>
-                      <input name="data.attributes.hp.max" type="text" value="{{data.attributes.hp.max}}" placeholder="10" data-dtype="Number"/>
-                  </div>
-                  <footer class="attribute-footer">
-                      <input name="data.attributes.hp.formula" class="hpformula" type="text" placeholder="{{ localize 'SW5E.HealthFormula' }}"
-                             value="{{data.attributes.hp.formula}}"/>
-                  </footer>
-              </li>
+            {{!-- Header Attributes --}}
+            <ul class="attributes flexrow">
+                <li class="attribute health">
+                    <h4 class="attribute-name box-title rollable">{{ localize "SW5E.Health" }}</h4>
+                    <div class="attribute-value multiple">
+                        <input name="data.attributes.hp.value" type="text" value="{{data.attributes.hp.value}}"
+                            placeholder="10" data-dtype="Number" />
+                        <span class="sep"> / </span>
+                        <input name="data.attributes.hp.max" type="text" value="{{data.attributes.hp.max}}"
+                            placeholder="10" data-dtype="Number" />
+                    </div>
+                    <footer class="attribute-footer">
+                        <input name="data.attributes.hp.formula" class="hpformula" type="text"
+                            placeholder="{{ localize 'SW5E.HealthFormula' }}" value="{{data.attributes.hp.formula}}" />
+                    </footer>
+                </li>
 
-              <li class="attribute">
-                  <h4 class="attribute-name box-title">{{ localize "SW5E.ArmorClass" }}</h4>
-                  <div class="attribute-value">
-                      <input name="data.attributes.ac.value" type="number" value="{{data.attributes.ac.value}}" placeholder="10"/>
-                  </div>
-                  <footer class="attribute-footer">
-                      <span>{{ localize "SW5E.Proficiency" }}</span>
-                      <span>{{numberFormat data.attributes.prof decimals=0 sign=true}}</span>
-                  </footer>
-              </li>
+                <li class="attribute">
+                    <h4 class="attribute-name box-title">{{ localize "SW5E.ArmorClass" }}</h4>
+                    <div class="attribute-value">
+                        <input name="data.attributes.ac.value" type="number" value="{{data.attributes.ac.value}}"
+                            placeholder="10" />
+                    </div>
+                    <footer class="attribute-footer">
+                        <span>{{ localize "SW5E.Proficiency" }}</span>
+                        <span>{{numberFormat data.attributes.prof decimals=0 sign=true}}</span>
+                    </footer>
+                </li>
 
-              <li class="attribute">
-                  <h4 class="attribute-name box-title">{{ localize "SW5E.Speed" }}</h4>
-                  <div class="attribute-value">
-                      <input name="data.attributes.speed.value" type="text"
-                             value="{{data.attributes.speed.value}}" placeholder="0"/>
-                  </div>
-                  <footer class="attribute-footer">
-                      <input type="text" class="speed" name="data.attributes.speed.special"
-                             value="{{data.attributes.speed.special}}" placeholder="{{ localize 'SW5E.SpeedSpecial' }}"/>
-                  </footer>
-              </li>
-          </ul>
-      </section>
-  </header>
+                <li class="attribute">
+                    <h4 class="attribute-name box-title">{{ localize "SW5E.Speed" }}</h4>
+                    <div class="attribute-value">
+                        <input name="data.attributes.speed.value" type="text" value="{{data.attributes.speed.value}}"
+                            placeholder="0" />
+                    </div>
+                    <footer class="attribute-footer">
+                        <input type="text" class="speed" name="data.attributes.speed.special"
+                            value="{{data.attributes.speed.special}}"
+                            placeholder="{{ localize 'SW5E.SpeedSpecial' }}" />
+                    </footer>
+                </li>
+            </ul>
+        </section>
+    </header>
 
-  {{!-- NPC Sheet Navigation --}}
-  <nav class="sheet-navigation tabs" data-group="primary">
-      <a class="item active" data-tab="attributes">{{ localize "SW5E.Attributes" }}</a>
-      <a class="item" data-tab="features">{{ localize "SW5E.Features" }}</a>
-      <a class="item" data-tab="powerbook">{{ localize "SW5E.Powerbook" }}</a>
-      <a class="item" data-tab="biography">{{ localize "SW5E.Biography" }}</a>
-  </nav>
+    {{!-- NPC Sheet Navigation --}}
+    <nav class="sheet-navigation tabs" data-group="primary">
+        <a class="item active" data-tab="attributes">{{ localize "SW5E.Attributes" }}</a>
+        <a class="item" data-tab="features">{{ localize "SW5E.Features" }}</a>
+        <a class="item" data-tab="powerbook">{{ localize "SW5E.Powerbook" }}</a>
+        <a class="item" data-tab="biography">{{ localize "SW5E.Biography" }}</a>
+    </nav>
 
-  {{!-- NPC Sheet Body --}}
-  <section class="sheet-body">
-      <div class="tab attributes flexrow" data-group="primary" data-tab="attributes">
+    {{!-- NPC Sheet Body --}}
+    <section class="sheet-body">
+        <div class="tab attributes flexrow" data-group="primary" data-tab="attributes">
 
-          {{!-- Ability Scores --}}
-          <ul class="ability-scores flexrow">
-          {{#each data.abilities as |ability id|}}
-              <li class="ability {{#if ability.proficient}}proficient{{/if}}" data-ability="{{id}}">
-                  <h4 class="ability-name box-title rollable">{{ability.label}}</h4>
-                  <input class="ability-score" name="data.abilities.{{id}}.value" type="number" value="{{ability.value}}" placeholder="10"/>
-                  <div class="ability-modifiers flexrow">
-                      <span class="ability-mod" title="Modifier">{{numberFormat ability.mod decimals=0 sign=true}}</span>
-                      <input type="hidden" name="data.abilities.{{id}}.proficient" value="{{ability.proficient}}" data-dtype="Number"/>
-                      <a class="proficiency-toggle ability-proficiency" title="{{ localize 'SW5E.Proficiency' }}">{{{ability.icon}}}</a>
-                      <span class="ability-save" title="Saving Throw">{{numberFormat ability.save decimals=0 sign=true}}</span>
-                  </div>
-              </li>
-          {{/each}}
-          </ul>
+            {{!-- Ability Scores --}}
+            <ul class="ability-scores flexrow">
+                {{#each data.abilities as |ability id|}}
+                <li class="ability {{#if ability.proficient}}proficient{{/if}}" data-ability="{{id}}">
+                    <h4 class="ability-name box-title rollable">{{ability.label}}</h4>
+                    <input class="ability-score" name="data.abilities.{{id}}.value" type="number"
+                        value="{{ability.value}}" placeholder="10" />
+                    <div class="ability-modifiers flexrow">
+                        <span class="ability-mod"
+                            title="Modifier">{{numberFormat ability.mod decimals=0 sign=true}}</span>
+                        <input type="hidden" name="data.abilities.{{id}}.proficient" value="{{ability.proficient}}"
+                            data-dtype="Number" />
+                        <a class="proficiency-toggle ability-proficiency"
+                            title="{{ localize 'SW5E.Proficiency' }}">{{{ability.icon}}}</a>
+                        <span class="ability-save"
+                            title="Saving Throw">{{numberFormat ability.save decimals=0 sign=true}}</span>
+                    </div>
+                </li>
+                {{/each}}
+            </ul>
 
-          {{!-- Skills --}}
-          <ul class="skills-list">
-          {{#each data.skills as |skill s|}}
-              <li class="skill flexrow {{#if skill.value}}proficient{{/if}}" data-skill="{{s}}">
-                  <input type="hidden" name="data.skills.{{s}}.value" value="{{skill.value}}" data-dtype="Number"/>
-                  <a class="proficiency-toggle skill-proficiency" title="{{skill.hover}}">{{{skill.icon}}}</a>
-                  <h4 class="skill-name rollable">{{skill.label}}</h4>
-                  <span class="skill-ability">{{skill.ability}}</span>
-                  <span class="skill-mod">{{numberFormat skill.total decimals=0 sign=true}}</span>
-                  <span class="skill-passive">({{skill.passive}})</span>
-              </li>
-          {{/each}}
-          </ul>
+            {{!-- Skills --}}
+            <ul class="skills-list">
+                {{#each data.skills as |skill s|}}
+                <li class="skill flexrow {{#if skill.value}}proficient{{/if}}" data-skill="{{s}}">
+                    <input type="hidden" name="data.skills.{{s}}.value" value="{{skill.value}}" data-dtype="Number" />
+                    <a class="proficiency-toggle skill-proficiency" title="{{skill.hover}}">{{{skill.icon}}}</a>
+                    <h4 class="skill-name rollable">{{skill.label}}</h4>
+                    <span class="skill-ability">{{skill.ability}}</span>
+                    <span class="skill-mod">{{numberFormat skill.total decimals=0 sign=true}}</span>
+                    <span class="skill-passive">({{skill.passive}})</span>
+                </li>
+                {{/each}}
+            </ul>
 
-          <section class="center-pane flexcol">
+            <section class="center-pane flexcol">
 
-              {{!-- Legendary Actions --}}
-              <div class="counters">
-                  <div class="counter flexrow legendary">
-                      <h4>{{ localize "SW5E.LegAct" }}</h4>
-                      <div class="counter-value">
-                          <input name="data.resources.legact.value" type="number" value="{{data.resources.legact.value}}" placeholder="0"/>
-                          <span class="sep">/</span>
-                          <input name="data.resources.legact.max" type="number" value="{{data.resources.legact.max}}" placeholder="0"/>
-                      </div>
-                  </div>
-                  <div class="counter flexrow legendary">
-                      <h4>{{ localize "SW5E.LegRes" }}</h4>
-                      <div class="counter-value">
-                          <input name="data.resources.legres.value" type="number" value="{{data.resources.legres.value}}" placeholder="0"/>
-                          <span class="sep">/</span>
-                          <input name="data.resources.legres.max" type="number" value="{{data.resources.legres.max}}" placeholder="0"/>
-                      </div>
-                  </div>
-                  <div class="counter flexrow lair">
-                      <h4>{{ localize "SW5E.LairAct" }}</h4>
-                      <div class="counter-value">
-                          <input name="data.resources.lair.value" type="checkbox" value="{{data.resources.lair.value}}"
-                                 data-dtype="Boolean" {{checked data.resources.lair.value}}/>
-                                 <input name="data.resources.lair.initiative" type="number" value="{{data.resources.lair.initiative}}" placeholder="20"/>
-                              </div>
-                  </div>
-              </div>
+                {{!-- Legendary Actions --}}
+                <div class="counters">
+                    <div class="counter flexrow legendary">
+                        <h4>{{ localize "SW5E.LegAct" }}</h4>
+                        <div class="counter-value">
+                            <input name="data.resources.legact.value" type="number"
+                                value="{{data.resources.legact.value}}" placeholder="0" />
+                            <span class="sep">/</span>
+                            <input name="data.resources.legact.max" type="number" value="{{data.resources.legact.max}}"
+                                placeholder="0" />
+                        </div>
+                    </div>
+                    <div class="counter flexrow legendary">
+                        <h4>{{ localize "SW5E.LegRes" }}</h4>
+                        <div class="counter-value">
+                            <input name="data.resources.legres.value" type="number"
+                                value="{{data.resources.legres.value}}" placeholder="0" />
+                            <span class="sep">/</span>
+                            <input name="data.resources.legres.max" type="number" value="{{data.resources.legres.max}}"
+                                placeholder="0" />
+                        </div>
+                    </div>
+                    <div class="counter flexrow lair">
+                        <h4>{{ localize "SW5E.LairAct" }}</h4>
+                        <div class="counter-value">
+                            <input name="data.resources.lair.value" type="checkbox"
+                                value="{{data.resources.lair.value}}" data-dtype="Boolean"
+                                {{checked data.resources.lair.value}} />
+                            <input name="data.resources.lair.initiative" type="number"
+                                value="{{data.resources.lair.initiative}}" placeholder="20" />
+                        </div>
+                    </div>
+                </div>
 
-              {{!-- Traits --}}
-              {{> "systems/sw5e/templates/actors/oldActor/parts/actor-traits.html"}}
-          </section>
-      </div>
+                {{!-- Traits --}}
+                {{> "systems/sw5e/templates/actors/oldActor/parts/actor-traits.html"}}
+            </section>
+        </div>
 
-      {{!-- Features Tab --}}
-      <div class="tab features flexcol" data-group="primary" data-tab="features">
-          {{> "systems/sw5e/templates/actors/oldActor/parts/actor-features.html" sections=features}}
-      </div>
+        {{!-- Features Tab --}}
+        <div class="tab features flexcol" data-group="primary" data-tab="features">
+            {{> "systems/sw5e/templates/actors/oldActor/parts/actor-features.html" sections=features}}
+        </div>
 
-      {{!-- Powerbook Tab --}}
-      <div class="tab powerbook flexcol" data-group="primary" data-tab="powerbook">
-          {{> "systems/sw5e/templates/actors/oldActor/parts/actor-powerbook.html"}}
-      </div>
+        {{!-- Powerbook Tab --}}
+        <div class="tab powerbook flexcol" data-group="primary" data-tab="powerbook">
+            {{> "systems/sw5e/templates/actors/oldActor/parts/actor-powerbook.html"}}
+        </div>
 
-      {{!-- Biography Tab --}}
-      <div class="tab biography flexcol" data-group="primary" data-tab="biography">
-          {{editor content=data.details.biography.value target="data.details.biography.value" button=true owner=owner editable=editable}}
-      </div>
-  </section>
+        {{!-- Biography Tab --}}
+        <div class="tab biography flexcol" data-group="primary" data-tab="biography">
+            {{editor content=data.details.biography.value target="data.details.biography.value" button=true owner=owner editable=editable}}
+        </div>
+    </section>
 </form>
\ No newline at end of file