diff --git a/src/templates/parts/sheet-sidebar.hbs b/src/templates/parts/sheet-sidebar.hbs
index 22c43dc..8029afa 100644
--- a/src/templates/parts/sheet-sidebar.hbs
+++ b/src/templates/parts/sheet-sidebar.hbs
@@ -2,8 +2,7 @@
 
   <div class="fancy-value">
     <h4>{{ localize "DND5E.Proficiency" }}</h4>
-    <div>{{#if systemFeatures.profLabel}}{{labels.proficiency}}{{else}}{{numberFormat system.attributes.prof decimals=0
-      sign=true}}{{/if}}</div>
+    <div>{{labels.proficiency}}</div>
   </div>
 
 
@@ -18,35 +17,31 @@
 
   {{!-- Skills --}}
   <ul class="skills-list">
-    {{#each system.skills as |skill s|}}
-    <li title="{{ localize " DND5E.Passive" }}: {{skill.passive}}"
-      class="skill flexrow {{#if skill.value}}proficient{{/if}}" data-skill="{{s}}">
+    {{#each config.skills as |obj s|}}
+    {{#with (lookup ../skills s) as |skill|}}
+    <li class="skill flexrow {{#if skill.value}}proficient{{/if}}" data-key="{{s}}">
       <input type="hidden" name="system.skills.{{s}}.value" value="{{skill.baseValue}}" data-dtype="Number" />
+
       <a class="proficiency-toggle skill-proficiency" title="{{skill.hover}}">{{{skill.icon}}}</a>
+
       <span class="skill-ability">{{skill.ability}}</span>
+
       <div class="skill-name-controls">
         <h4 class="skill-name rollable">{{skill.label}}</h4>
-        {{#if @root/systemFeatures.skillConfig}}<a class="config-button" data-action="skill"
-          title="{{localize 'DND5E.SkillConfigure'}}"><i class="fas fa-cog"></i></a>{{/if}}
+        <a class="config-button" data-action="skill" title="{{localize 'DND5E.SkillConfigure'}}"><i
+            class="fas fa-cog"></i></a>
       </div>
+
       <span class="skill-mod">{{numberFormat skill.total decimals=0 sign=true}}</span>
+
+      <span class="skill-passive" title="{{ localize 'DND5E.SkillPassiveHint' skill=skill.label }}">
+        ({{skill.passive}})
+      </span>
     </li>
+    {{/with}}
     {{/each}}
   </ul>
 
-  {{#each settings.compact-beyond-5e-sheet.passiveDisplay as |bool s|}}
-  {{#if bool}}
-  {{#with (getProperty ../system.skills s)}}
-  <div class="fancy-value">
-    <h4>{{ localize "DND5E.Passive" }} {{label}}</h4>
-    <div>
-      {{numberFormat passive decimals=0 sign=false}}
-    </div>
-  </div>
-  {{/with}}
-  {{/if}}
-  {{/each}}
-
-  {{> (cb5es-path "templates/parts/actor-traits.hbs")}}
+  {{> (concat moduleFilePath "templates/parts/actor-traits.hbs")}}
 
-</aside>
\ No newline at end of file
+</aside>