diff --git a/less/update/components/actor-global.less b/less/update/components/actor-global.less
index 878877bd..1361c2df 100644
--- a/less/update/components/actor-global.less
+++ b/less/update/components/actor-global.less
@@ -93,6 +93,11 @@
                 .charlevel {
                     .russoOne(17px);
                     text-align: right;
+                    input {
+                        display: inline-block;
+                        width: 42px;
+                        height: auto;
+                    }
                 }
 
                 .experience {
@@ -932,6 +937,9 @@
             &>.panel {
                 grid-template-rows: 32px 24px 24px auto;
             }
+            h3.power-dc {
+                line-height: 24px;
+            }
             .powercasting-ability {
                 display: grid;
                 grid-template-columns: 2fr 1fr 1fr;
@@ -991,4 +999,52 @@
             }
         }
     }
+    &.npc {
+        .swalt-sheet {
+            header {
+                h1.character-name {
+                    align-self: auto;
+                }
+                .attributes {
+                    grid-template-columns: repeat(3, 1fr);
+                    footer {
+                        &.proficiency {
+                            margin-top: 0;
+                            line-height: 24px;
+                            text-align: center;
+                        }
+                        &.hit-points {
+                            display: block;
+                        }
+                    }
+                }
+            }
+            nav.sheet-navigation {
+                grid-template-columns: repeat(4, 1fr);
+            }
+            .tab.attributes {
+                .traits-resources {
+                    display: block;
+
+                        .counter {
+                            display: flex;
+                            .counter-value {
+                                margin-left: auto;
+                            }
+                        }
+                    // section.traits {
+                    //     display:block;
+                    // }
+                }
+            }
+            .tab.powerbook {
+                input.powercasting-level {
+                    width: 48px;
+                }
+            }
+            .tab.biography.active {
+                display: block;
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/less/update/components/actor-themes.less b/less/update/components/actor-themes.less
index aa1ed4d5..6e2a5f44 100644
--- a/less/update/components/actor-themes.less
+++ b/less/update/components/actor-themes.less
@@ -404,4 +404,13 @@
             }
         }
     }
+    &.npc {
+        .swalt-sheet {
+            header {
+                .experience {
+                    color: @actorProficiencyTextColor;
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/module/actor/sheets/newSheet/npc.js b/module/actor/sheets/newSheet/npc.js
index 42d63fe8..450faabb 100644
--- a/module/actor/sheets/newSheet/npc.js
+++ b/module/actor/sheets/newSheet/npc.js
@@ -17,7 +17,12 @@ export default class ActorSheet5eNPCNew extends ActorSheet5e {
 	  return mergeObject(super.defaultOptions, {
       classes: ["sw5e", "sheet", "actor", "npc"],
       width: 600,
-      height: 680
+      width: 800,
+      tabs: [{
+        navSelector: ".root-tabs",
+        contentSelector: ".sheet-body",
+        initial: "attributes"
+      }],
     });
   }
 
diff --git a/sw5e-dark.css b/sw5e-dark.css
index 1f896724..cd1e8030 100644
--- a/sw5e-dark.css
+++ b/sw5e-dark.css
@@ -767,3 +767,6 @@ body.dark-theme .sw5e.sheet.actor .swalt-sheet .tab.notes section > input {
   color: #E81111;
   border-bottom: 2px solid #0d99cc;
 }
+body.dark-theme .sw5e.sheet.actor.npc .swalt-sheet header .experience {
+  color: #4f4f4f;
+}
diff --git a/sw5e-global.css b/sw5e-global.css
index 32f78c35..878b9c65 100644
--- a/sw5e-global.css
+++ b/sw5e-global.css
@@ -783,6 +783,11 @@ input[type="reset"]:disabled {
   letter-spacing: 0.5px;
   text-align: right;
 }
+.sw5e.sheet.actor .swalt-sheet header .level-experience .charlevel input {
+  display: inline-block;
+  width: 42px;
+  height: auto;
+}
 .sw5e.sheet.actor .swalt-sheet header .level-experience .experience {
   font-family: 'Russo One';
   font-size: 17px;
@@ -1507,6 +1512,9 @@ input[type="reset"]:disabled {
 .sw5e.sheet.actor .swalt-sheet .tab.powerbook > .panel {
   grid-template-rows: 32px 24px 24px auto;
 }
+.sw5e.sheet.actor .swalt-sheet .tab.powerbook h3.power-dc {
+  line-height: 24px;
+}
 .sw5e.sheet.actor .swalt-sheet .tab.powerbook .powercasting-ability {
   display: grid;
   grid-template-columns: 2fr 1fr 1fr;
@@ -1567,6 +1575,38 @@ input[type="reset"]:disabled {
 .sw5e.sheet.actor .swalt-sheet.limited .tab.biography {
   grid-template-columns: 100%;
 }
+.sw5e.sheet.actor.npc .swalt-sheet header h1.character-name {
+  align-self: auto;
+}
+.sw5e.sheet.actor.npc .swalt-sheet header .attributes {
+  grid-template-columns: repeat(3, 1fr);
+}
+.sw5e.sheet.actor.npc .swalt-sheet header .attributes footer.proficiency {
+  margin-top: 0;
+  line-height: 24px;
+  text-align: center;
+}
+.sw5e.sheet.actor.npc .swalt-sheet header .attributes footer.hit-points {
+  display: block;
+}
+.sw5e.sheet.actor.npc .swalt-sheet nav.sheet-navigation {
+  grid-template-columns: repeat(4, 1fr);
+}
+.sw5e.sheet.actor.npc .swalt-sheet .tab.attributes .traits-resources {
+  display: block;
+}
+.sw5e.sheet.actor.npc .swalt-sheet .tab.attributes .traits-resources .counter {
+  display: flex;
+}
+.sw5e.sheet.actor.npc .swalt-sheet .tab.attributes .traits-resources .counter .counter-value {
+  margin-left: auto;
+}
+.sw5e.sheet.actor.npc .swalt-sheet .tab.powerbook input.powercasting-level {
+  width: 48px;
+}
+.sw5e.sheet.actor.npc .swalt-sheet .tab.biography.active {
+  display: block;
+}
 @keyframes pause-spin {
   from {
     transform: rotate(0deg);
diff --git a/sw5e-light.css b/sw5e-light.css
index 3c53971b..121dfa83 100644
--- a/sw5e-light.css
+++ b/sw5e-light.css
@@ -767,3 +767,6 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.notes section > input {
   color: #c40f0f;
   border-bottom: 2px solid #0d99cc;
 }
+body.light-theme .sw5e.sheet.actor.npc .swalt-sheet header .experience {
+  color: #4f4f4f;
+}
diff --git a/templates/actors/newActor/npc-sheet.html b/templates/actors/newActor/npc-sheet.html
index 810e99f7..73934670 100644
--- a/templates/actors/newActor/npc-sheet.html
+++ b/templates/actors/newActor/npc-sheet.html
@@ -17,136 +17,119 @@
             </div>
 
         </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"/>
-              </div>
-              <div class="experience">
-                  <span>{{data.details.xp.value}} XP</span>
-              </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}}"
+        <div class="summary">
+			<span>{{lookup config.actorSizes data.traits.size}}</span>
+			<input type="text" name="data.details.alignment" value="{{data.details.alignment}}"
+				placeholder="{{ localize 'SW5E.Alignment' }}" />
+                <input type="text" name="data.details.type" value="{{data.details.type}}"
+                placeholder="{{ localize 'SW5E.Type' }}" />
+                <input type="text" name="data.details.source" value="{{data.details.source}}"
                         placeholder="{{ localize 'SW5E.Source' }}" />
-                </li>
-            </ul>
+        </div>
+        <div class="attributes">
+			{{!-- ARMOR CLASS --}}
+			<section>
+				<h1>{{ localize "SW5E.ArmorClass" }}</h1>
+				<div class="attribute-value">
+					<input class="ac-display" name="data.attributes.ac.value" type="text"
+						value="{{data.attributes.ac.value}}" data-dtype="Number" placeholder="10" />
+                </div>
+                <footer class="attribute-footer proficiency">
+                    {{ localize "SW5E.Proficiency" }}
+                    {{numberFormat data.attributes.prof decimals=0 sign=true}}
+                </footer>
+			</section>
 
-            {{!-- 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"
+			{{!-- HIT POINTS --}}
+			<section>
+				<h1>Hit Points</h1>
+				<div class="attribute-value multiple">
+					<input name="data.attributes.hp.value" type="text" value="{{data.attributes.hp.value}}"
+						data-dtype="Number" placeholder="10" class="value-number" />
+					<span class="value-separator">/</span>
+					<input name="data.attributes.hp.max" type="text" value="{{data.attributes.hp.max}}"
+						data-dtype="Number" placeholder="10" class="value-number" />
+				</div>
+				<footer class="attribute-footer hit-points">
+					<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.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>
+				</footer>
+            </section>
+            <section>
+				<h1>{{ localize "SW5E.Speed" }}</h1>
+				<div class="attribute-value">
+					<input name="data.attributes.speed.value" type="text" value="{{data.attributes.speed.value}}"
+						placeholder="0" />
+				</div>
+				<footer class="attribute-footer speed">
+					<input type="text" class="speed" name="data.attributes.speed.special"
+						value="{{data.attributes.speed.special}}" placeholder="{{ localize 'SW5E.SpeedSpecial' }}" />
+				</footer>
+			</section>
+            </div>
+        
     </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 class="sheet-navigation root-tabs" data-group="primary">
+        <button class="item active" data-tab="attributes">{{ localize "SW5E.Attributes" }}</button>
+        <button class="item" data-tab="features">{{ localize "SW5E.Features" }}</button>
+        <button class="item" data-tab="powerbook">{{ localize "SW5E.Powerbook" }}</button>
+        <button class="item" data-tab="biography">{{ localize "SW5E.Biography" }}</button>
     </nav>
 
     {{!-- 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>
-
-            {{!-- 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="tab attributes core" data-group="primary" data-tab="attributes">
+			<section class="panel abilities">
+                {{!-- Ability Scores --}}
+                <section class="scores">
+                    <h1>Ability Scores</h1>
+                    <ol>
+                        {{#each data.abilities as |ability id|}}
+                        <li class="ability {{#if ability.proficient}}proficient{{/if}}" data-ability="{{id}}">
+                            <h2 class="ability-name rollable">{{ability.label}}</h4>
+                                <input class="ability-score" name="data.abilities.{{id}}.value" type="text"
+                                    value="{{ability.value}}" data-dtype="Number" placeholder="10" />
+                                <div class="ability-modifiers">
+                                    <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" />
+                                    <button class="proficiency-toggle ability-proficiency"
+                                        title="Proficiency">{{{ability.icon}}}</button>
+                                    <span class="ability-save"
+                                        title="Saving Throw">{{numberFormat ability.save decimals=0 sign=true}}</span>
+                                </div>
+                        </li>
+                        {{/each}}
+                    </ol>
+                </section>
+                {{!-- Skills --}}
+                <section class="skills">
+                    <h1>Skills</h1>
+                    <ol>
+                        {{#each data.skills as |skill s|}}
+                        <li class="skill {{#if skill.value}}proficient{{/if}}" data-skill="{{s}}">
+                            <input type="hidden" name="data.skills.{{s}}.value" value="{{skill.value}}"
+                                data-dtype="Number" />
+                            <button class="proficiency-toggle skill-proficiency"
+                                title="{{skill.hover}}">{{{skill.icon}}}</button>
+                            <span class="skill-name rollable">{{skill.label}}</span>
+                            <span class="skill-ability">{{skill.ability}}</span>
+                            <span class="skill-mod">{{numberFormat skill.total decimals=0 sign=true}}</span>
+                            {{!-- <input class="skill-bonus" name="data.skills.{{s}}.bonus" type="text" value="{{numberFormat skill.bonus decimals=0 sign=true}}" data-dtype="Number" placeholder="0" title="Misc. Modifier"/> --}}
+                            {{!-- <span class="skill-passive">({{skill.passive}})</span> --}}
+                        </li>
+                        {{/each}}
+                    </ol>
+                </section>
+            </section>
+            <section class="panel traits-resources">
                 {{!-- Legendary Actions --}}
                 <div class="counters">
-                    <div class="counter flexrow legendary">
-                        <h4>{{ localize "SW5E.LegAct" }}</h4>
+                    <div class="counter legendary">
+                        <strong>{{ localize "SW5E.LegAct" }}</strong>  
                         <div class="counter-value">
                             <input name="data.resources.legact.value" type="number"
                                 value="{{data.resources.legact.value}}" placeholder="0" />
@@ -155,8 +138,8 @@
                                 placeholder="0" />
                         </div>
                     </div>
-                    <div class="counter flexrow legendary">
-                        <h4>{{ localize "SW5E.LegRes" }}</h4>
+                    <div class="counter legendary">
+                        <strong>{{ localize "SW5E.LegRes" }}</strong>
                         <div class="counter-value">
                             <input name="data.resources.legres.value" type="number"
                                 value="{{data.resources.legres.value}}" placeholder="0" />
@@ -165,8 +148,8 @@
                                 placeholder="0" />
                         </div>
                     </div>
-                    <div class="counter flexrow lair">
-                        <h4>{{ localize "SW5E.LairAct" }}</h4>
+                    <div class="counter lair">
+                        <strong>{{ localize "SW5E.LairAct" }}</strong>
                         <div class="counter-value">
                             <input name="data.resources.lair.value" type="checkbox"
                                 value="{{data.resources.lair.value}}" data-dtype="Boolean"
@@ -176,25 +159,31 @@
                         </div>
                     </div>
                 </div>
-
-                {{!-- Traits --}}
-                {{> "systems/sw5e/templates/actors/oldActor/parts/actor-traits.html"}}
+                <div class="core-traits">
+                    {{> "systems/sw5e/templates/actors/newActor/parts/swalt-traits.html"}}
+                </div>
             </section>
-        </div>
+		</section>
 
         {{!-- Features Tab --}}
         <div class="tab features flexcol" data-group="primary" data-tab="features">
-            {{> "systems/sw5e/templates/actors/oldActor/parts/actor-features.html" sections=features}}
+            {{> "systems/sw5e/templates/actors/newActor/parts/swalt-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"}}
+            {{> "systems/sw5e/templates/actors/newActor/parts/swalt-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 class="panel">
+                <section>
+                    <h1>Biography</h1>
+                    {{editor content=data.details.biography.value target="data.details.biography.value" button=true owner=owner editable=editable}}
+
+                </section>
+            </div>
         </div>
     </section>
 </form>
\ No newline at end of file