diff --git a/lang/en.json b/lang/en.json
index d19dfb58..9bcf02b5 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -113,9 +113,7 @@
                 },
                 "displayInChat": "Display in chat",
                 "deleteTriggerTitle": "Delete Trigger",
-                "deleteTriggerContent": "Are you sure you want to delete the {trigger} trigger?",
-                "advantageState": "Advantage State",
-                "damageOnSave": "Damage on Save"
+                "deleteTriggerContent": "Are you sure you want to delete the {trigger} trigger?"
             },
             "RollField": {
                 "diceRolling": {
@@ -127,7 +125,7 @@
                 }
             },
             "Settings": {
-                "attackModifier": "Attack Modifier",
+                "attackBonus": "Attack Bonus",
                 "attackName": "Attack Name",
                 "criticalThreshold": "Critical Threshold",
                 "includeBase": { "label": "Include Item Damage" },
diff --git a/module/applications/sheets-configs/action-config.mjs b/module/applications/sheets-configs/action-config.mjs
index e073cfa6..e15b0391 100644
--- a/module/applications/sheets-configs/action-config.mjs
+++ b/module/applications/sheets-configs/action-config.mjs
@@ -21,6 +21,7 @@ export default class DHActionConfig extends DHActionBaseConfig {
 
     static async addEffect(_event) {
         if (!this.action.effects) return;
+        const effectData = this._addEffectData.bind(this)();
         const data = this.action.toObject();
 
         const created = await this.action.item.createEmbeddedDocuments('ActiveEffect', [
diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index 5d40a470..d41d2d4a 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -232,7 +232,7 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
         return {
             multiplier: new fields.StringField({
                 choices: CONFIG.DH.GENERAL.multiplierTypes,
-                initial: 'flat',
+                initial: 'prof',
                 label: 'DAGGERHEART.ACTIONS.Config.damage.multiplier',
                 nullable: false,
                 required: true
@@ -244,7 +244,7 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
             }),
             dice: new fields.StringField({
                 choices: CONFIG.DH.GENERAL.diceTypes,
-                initial: CONFIG.DH.GENERAL.diceTypes.d6,
+                initial: 'd6',
                 label: 'DAGGERHEART.GENERAL.Dice.single',
                 nullable: false,
                 required: true
diff --git a/system.json b/system.json
index ea71aaba..b1fe74d8 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.0.1",
+    "version": "2.0.0",
     "compatibility": {
         "minimum": "14.359",
         "verified": "14.359",
diff --git a/templates/actionTypes/effect.hbs b/templates/actionTypes/effect.hbs
index 8c5e6e68..dd6a7974 100644
--- a/templates/actionTypes/effect.hbs
+++ b/templates/actionTypes/effect.hbs
@@ -4,6 +4,21 @@
         <a><i class="fa-solid fa-plus icon-button" data-action="addEffect"></i></a>
     </legend>
     <ul class="items-list">
+        {{!-- {{#each source as | effect index |}}
+            <div class="inventory-item" data-effect-id="{{effect._id}}" data-action="editEffect">
+                {{#with (@root.getEffectDetails effect._id) as | details |}}
+                        <img class="item-img" src="{{img}}">
+                    <div class="item-label">
+                        <span class="item-name">{{name}}</span>
+                    </div>
+                {{/with}}
+                <input type="hidden" name="effects.{{index}}._id" value="{{effect._id}}">
+                {{#if @root.source.save.trait}}{{formInput ../fields.onSave value=effect.onSave name=(concat "effects." index ".onSave") dataset=(object tooltip=(localize "DAGGERHEART.UI.Tooltip.appliedEvenIfSuccessful") tooltipDirection="UP")}}{{/if}}
+                <div class="controls">
+                    <a data-tooltip="{{localize "CONTROLS.CommonDelete"}}" data-action="removeEffect" data-index="{{index}}"><i class="fas fa-trash"></i></a>
+                </div>
+            </div>
+        {{/each}} --}}
         {{#each source as | effect index |}}
             <div class="inventory-item single-img" data-effect-id="{{effect._id}}" data-action="editEffect">
                 <div class="inventory-item-header">
diff --git a/templates/actionTypes/roll.hbs b/templates/actionTypes/roll.hbs
index 2f257768..3e25b9c8 100644
--- a/templates/actionTypes/roll.hbs
+++ b/templates/actionTypes/roll.hbs
@@ -17,13 +17,13 @@
         <div class="nest-inputs">
             {{#unless (eq source.type 'spellcast')}}
                 {{#if @root.isNPC}}
-                    {{formField fields.bonus label="DAGGERHEART.GENERAL.Modifier.single" name="roll.bonus" value=source.bonus placeholder=@root.baseAttackBonus disabled=(not source.type)}}
+                    {{formField fields.bonus label="Bonus" name="roll.bonus" value=source.bonus placeholder=@root.baseAttackBonus disabled=(not source.type)}}
                 {{else}}
-                    {{formField fields.trait label="DAGGERHEART.GENERAL.Trait.single" name="roll.trait" value=source.trait localize=true disabled=(not source.type)}}
+                    {{formField fields.trait label="Trait" name="roll.trait" value=source.trait localize=true disabled=(not source.type)}}
                 {{/if}}
             {{/unless}}
-            {{formField fields.difficulty label="DAGGERHEART.GENERAL.difficulty" name="roll.difficulty" value=source.difficulty disabled=(not source.type)}}
-            {{formField fields.advState label="DAGGERHEART.ACTIONS.Config.advantageState" name="roll.advState" value=source.advState localize=true disabled=(not source.type)}}
+            {{formField fields.difficulty label="Difficulty" name="roll.difficulty" value=source.difficulty disabled=(not source.type)}}
+            {{formField fields.advState label= "Advantage State" name="roll.advState" value=source.advState localize=true disabled=(not source.type)}}
         </div>
     {{/if}}
 </fieldset>
\ No newline at end of file
diff --git a/templates/actionTypes/save.hbs b/templates/actionTypes/save.hbs
index fdadba54..85536c87 100644
--- a/templates/actionTypes/save.hbs
+++ b/templates/actionTypes/save.hbs
@@ -2,8 +2,8 @@
     <legend>{{localize "DAGGERHEART.GENERAL.Roll.reaction"}}</legend>
     <p class="hint">{{localize "DAGGERHEART.ACTIONS.Settings.saveHint"}}</p>
     <div class="nest-inputs">
-        {{formField fields.trait label="DAGGERHEART.GENERAL.Trait.single" name="save.trait" value=source.trait localize=true}}
-        {{formField fields.difficulty label="DAGGERHEART.GENERAL.difficulty" name="save.difficulty" value=source.difficulty disabled=(not source.trait) placeholder=@root.baseSaveDifficulty}}
-        {{formField fields.damageMod label="DAGGERHEART.ACTIONS.Config.damageOnSave" name="save.damageMod" value=source.damageMod localize=true disabled=(not source.trait)}}
+        {{formField fields.trait label="Trait" name="save.trait" value=source.trait localize=true}}
+        {{formField fields.difficulty label="Difficulty" name="save.difficulty" value=source.difficulty disabled=(not source.trait) placeholder=@root.baseSaveDifficulty}}
+        {{formField fields.damageMod label="Damage on Save" name="save.damageMod" value=source.damageMod localize=true disabled=(not source.trait)}}
     </div>
 </fieldset>
\ No newline at end of file
diff --git a/templates/sheets-settings/adversary-settings/attack.hbs b/templates/sheets-settings/adversary-settings/attack.hbs
index f829338f..c3ee21f6 100644
--- a/templates/sheets-settings/adversary-settings/attack.hbs
+++ b/templates/sheets-settings/adversary-settings/attack.hbs
@@ -11,7 +11,7 @@
     <fieldset class="one-column">
         <legend>{{localize "DAGGERHEART.GENERAL.attack"}}</legend>
         <div class="nest-inputs">
-            {{formField systemFields.attack.fields.roll.fields.bonus value=document._source.system.attack.roll.bonus label="DAGGERHEART.ACTIONS.Settings.attackModifier" name="system.attack.roll.bonus" localize=true}}
+            {{formField systemFields.attack.fields.roll.fields.bonus value=document._source.system.attack.roll.bonus label="DAGGERHEART.ACTIONS.Settings.attackBonus" name="system.attack.roll.bonus" localize=true}}
             {{formField systemFields.attack.fields.range value=document._source.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}}
             {{#if systemFields.attack.fields.target.fields}}
                 {{ formField systemFields.attack.fields.target.fields.type value=document._source.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true }}
diff --git a/templates/ui/sceneNavigation/scene-navigation.hbs b/templates/ui/sceneNavigation/scene-navigation.hbs
index 5bdbbdad..68df761e 100644
--- a/templates/ui/sceneNavigation/scene-navigation.hbs
+++ b/templates/ui/sceneNavigation/scene-navigation.hbs
@@ -11,21 +11,19 @@
             {{> ".scene" }}
         </menu>
     {{/with}}
-    {{#if scenes.levels}}
-        <menu id="scene-navigation-levels" class="scene-levels scene-navigation-menu flexcol" style="--max-levels: {{ scenes.levels.length }}">
-            {{#each scenes.levels}}
-            <li class="level-row">
-                {{#with button}}
-                <button type="button" class="ui-control icon fa-solid {{ css }}" data-action="cycleLevel"
-                        data-direction="{{ direction }}" aria-label="{{ label }}"></button>
-                {{/with}}
-                <div class="ui-control scene scene-level {{ css }}" data-scene-id="{{ sceneId }}" data-level-id="{{ id }}" data-action="viewLevel">
-                    <span class="ellipsis">{{ name }}</span>
-                </div>
-            </li>
-            {{/each}}
-        </menu>
-    {{/if}}
+    <menu id="scene-navigation-levels" class="scene-levels scene-navigation-menu flexcol levels-{{ scenes.levels.length }}">
+        {{#each scenes.levels}}
+        <li class="level-row">
+            {{#with button}}
+            <button type="button" class="ui-control icon fa-solid {{ css }}" data-action="cycleLevel"
+                    data-direction="{{ direction }}" aria-label="{{ label }}"></button>
+            {{/with}}
+            <div class="ui-control scene scene-level {{ css }}" data-scene-id="{{ sceneId }}" data-level-id="{{ id }}" data-action="viewLevel">
+                <span class="ellipsis">{{ name }}</span>
+            </div>
+        </li>
+        {{/each}}
+    </menu>
     <menu id="scene-navigation-active" class="scene-navigation-menu flexcol">
         {{#each scenes.active}}
         {{> ".scene" }}
@@ -36,6 +34,39 @@
         {{> ".scene" }}
         {{/each}}
     </menu>
+    {{!-- <menu id="scene-navigation-active" class="scene-navigation-menu flexcol">
+        {{#each scenes.active as |scene|}}
+            <li class="scene-wrapper">
+                <ul>
+                    <li class="ui-control scene {{scene.cssClass}}" data-scene-id="{{scene.id}}" data-action="viewScene" {{#if scene.tooltip}}data-tooltip-text="{{scene.tooltip}}"{{/if}}>
+                        <span class="scene-name ellipsis">{{scene.name}}</span>
+                        {{#if scene.users}}
+                        <ul class="scene-players">
+                            {{#each scene.users as |user|}}
+                            <li class="scene-player" style="--color-bg:{{user.color}}; --color-border:{{user.border}}"
+                                data-tooltip aria-label="{{user.name}}">{{user.letter}}</li>
+                            {{/each}}
+                        </ul>
+                        {{/if}}
+                    </li>
+                </ul>
+                {{#if scene.hasEnvironments}}
+                    <button class="ui-control scene-environment {{#if (gt scene.environments.length 1)}}many-environments{{/if}}" data-action="openSceneEnvironment" data-scene-id="{{scene.id}}"><img src="{{scene.environmentImage}}" /> </button>
+                {{/if}}
+            </li>
+        {{/each}}
+    </menu>
+    <menu id="scene-navigation-inactive" class="scene-navigation-menu flexcol">
+        {{#each scenes.inactive as |scene|}}
+            <li class="scene-wrapper">
+                <ul>
+                <li class="ui-control scene {{scene.cssClass}}" data-scene-id="{{scene.id}}" data-action="viewScene" {{#if scene.tooltip}}data-tooltip-text="{{scene.tooltip}}"{{/if}}>
+                    <span class="scene-name ellipsis">{{scene.name}}</span>
+                </li>
+                </ul>
+            </li>
+        {{/each}}
+    </menu> --}}
 </nav>
 
 {{#*inline ".scene"}}