diff --git a/daggerheart.mjs b/daggerheart.mjs
index 84ce2779..abe12524 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -405,8 +405,6 @@ Hooks.on('chatMessage', (_, message) => {
 });
 
 const updateActorsRangeDependentEffects = async token => {
-    if (!token) return;
-
     const rangeMeasurement = game.settings.get(
         CONFIG.DH.id,
         CONFIG.DH.SETTINGS.gameSettings.variantRules
diff --git a/lang/en.json b/lang/en.json
index 2dc13ecf..1766b218 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -71,7 +71,9 @@
                     "name": "Summon",
                     "tooltip": "Create tokens in the scene.",
                     "error": "You do not have permission to summon tokens or there is no active scene.",
-                    "invalidDrop": "You can only drop Actor entities to summon."
+                    "invalidDrop": "You can only drop Actor entities to summon.",
+                    "chatMessageTitle": "Test2",
+                    "chatMessageHeaderTitle": "Summoning"
                 },
                 "transform": {
                     "name": "Transform",
@@ -85,7 +87,9 @@
             },
             "Config": {
                 "beastform": {
-                    "exact": { "label": "Beastform Max Tier", "hint": "The Character's Tier is used if empty" }
+                    "exact": "Beastform Max Tier",
+                    "exactHint": "The Character's Tier is used if empty",
+                    "label": "Beastform"
                 },
                 "countdown": {
                     "defaultOwnership": "Default Ownership",
@@ -1914,10 +1918,6 @@
                     "hint": "Multiply any damage dealt to you by this number"
                 }
             },
-            "Battlepoints": {
-                "full": "Battlepoints",
-                "short": "BP"
-            },
             "Bonuses": {
                 "rest": {
                     "downtimeAction": "Downtime Action",
@@ -2332,7 +2332,6 @@
             "next": "Next",
             "none": "None",
             "noTarget": "No current target",
-            "optionalThing": "Optional {thing}",
             "partner": "Partner",
             "player": {
                 "single": "Player",
@@ -2355,7 +2354,6 @@
             "rollDamage": "Roll Damage",
             "rollWith": "{roll} Roll",
             "save": "Save",
-            "saveSettings": "Save Settings",
             "scalable": "Scalable",
             "scars": "Scars",
             "situationalBonus": "Situational Bonus",
@@ -2510,14 +2508,8 @@
             },
             "Weapon": {
                 "weaponType": "Weapon Type",
-                "primaryWeapon": {
-                    "full": "Primary Weapon",
-                    "short": "Primary"
-                },
-                "secondaryWeapon": {
-                    "full": "Secondary Weapon",
-                    "short": "Secondary"
-                }
+                "primaryWeapon": "Primary Weapon",
+                "secondaryWeapon": "Secondary Weapon"
             }
         },
         "MACROS": {
@@ -2978,7 +2970,6 @@
             },
             "ItemBrowser": {
                 "title": "Daggerheart Compendium Browser",
-                "windowTitle": "Compendium Browser",
                 "hint": "Select a Folder in sidebar to start browsing through the compendium",
                 "browserSettings": "Browser Settings",
                 "columnName": "Name",
diff --git a/module/applications/characterCreation/characterCreation.mjs b/module/applications/characterCreation/characterCreation.mjs
index 467366fc..aa764c56 100644
--- a/module/applications/characterCreation/characterCreation.mjs
+++ b/module/applications/characterCreation/characterCreation.mjs
@@ -11,10 +11,7 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
         this.character = character;
 
         this.setup = {
-            traits: Object.keys(this.character.system.traits).reduce((acc, key) => {
-                acc[key] = { value: null };
-                return acc;
-            }, {}),
+            traits: this.character.system.traits,
             ancestryName: {
                 primary: '',
                 secondary: ''
@@ -380,10 +377,8 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
         ];
         return Object.values(this.setup.traits).reduce((acc, x) => {
             const index = traitCompareArray.indexOf(x.value);
-            if (index === -1) return acc;
-
             traitCompareArray.splice(index, 1);
-            acc += 1;
+            acc += index !== -1;
             return acc;
         }, 0);
     }
diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index 67a16f6a..9ca328a0 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -37,7 +37,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         tag: 'div',
         window: {
             frame: true,
-            title: 'DAGGERHEART.UI.ItemBrowser.windowTitle',
+            title: 'Compendium Browser',
             icon: 'fa-solid fa-book-atlas',
             positioned: true,
             resizable: true
@@ -583,9 +583,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         const { itemUuid } = event.target.closest('[data-item-uuid]').dataset,
             item = await foundry.utils.fromUuid(itemUuid),
             dragData = item.toDragData();
-
         event.dataTransfer.setData('text/plain', JSON.stringify(dragData));
-        event.dataTransfer.setDragImage(event.target.querySelector('img'), 0, 0);
     }
 
     _canDragStart() {
diff --git a/module/config/itemBrowserConfig.mjs b/module/config/itemBrowserConfig.mjs
index f20e56d0..0a4154a8 100644
--- a/module/config/itemBrowserConfig.mjs
+++ b/module/config/itemBrowserConfig.mjs
@@ -74,13 +74,12 @@ export const typeConfig = {
         columns: [
             {
                 key: 'type',
-                label: 'DAGGERHEART.GENERAL.type',
-                format: type => type ? `TYPES.Item.${type}` : '-'
+                label: 'DAGGERHEART.GENERAL.type'
             },
             {
                 key: 'system.secondary',
                 label: 'DAGGERHEART.UI.ItemBrowser.subtype',
-                format: isSecondary => (isSecondary ? 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.short' : isSecondary === false ? 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.short' : '-')
+                format: isSecondary => (isSecondary ? 'secondary' : isSecondary === false ? 'primary' : '-')
             },
             {
                 key: 'system.tier',
@@ -100,8 +99,8 @@ export const typeConfig = {
                 key: 'system.secondary',
                 label: 'DAGGERHEART.UI.ItemBrowser.subtype',
                 choices: [
-                    { value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.full' },
-                    { value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full' }
+                    { value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon' },
+                    { value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon' }
                 ]
             },
             {
@@ -259,13 +258,11 @@ export const typeConfig = {
         columns: [
             {
                 key: 'system.type',
-                label: 'DAGGERHEART.GENERAL.type',
-                format: type => type ? `DAGGERHEART.CONFIG.DomainCardTypes.${type}` : '-'
+                label: 'DAGGERHEART.GENERAL.type'
             },
             {
                 key: 'system.domain',
-                label: 'DAGGERHEART.GENERAL.Domain.single',
-                format: domain => domain ? CONFIG.DH.DOMAIN.allDomains()[domain].label : '-'
+                label: 'DAGGERHEART.GENERAL.Domain.single'
             },
             {
                 key: 'system.level',
@@ -377,7 +374,7 @@ export const typeConfig = {
         columns: [
             {
                 key: 'system.linkedClass',
-                label: 'TYPES.Item.class',
+                label: 'Class',
                 format: linkedClass => linkedClass?.name ?? 'DAGGERHEART.UI.ItemBrowser.missing'
             },
             {
@@ -389,7 +386,7 @@ export const typeConfig = {
         filters: [
             {
                 key: 'system.linkedClass.uuid',
-                label: 'TYPES.Item.class',
+                label: 'Class',
                 choices: items => {
                     const list = items
                         .filter(item => item.system.linkedClass)
@@ -413,8 +410,7 @@ export const typeConfig = {
             },
             {
                 key: 'system.mainTrait',
-                label: 'DAGGERHEART.GENERAL.Trait.single',
-                format: trait => (trait ? `DAGGERHEART.CONFIG.Traits.${trait}.name` : '-')
+                label: 'DAGGERHEART.GENERAL.Trait.single'
             }
         ],
         filters: [
diff --git a/module/data/fields/action/beastformField.mjs b/module/data/fields/action/beastformField.mjs
index 5e9c75f0..e19807c7 100644
--- a/module/data/fields/action/beastformField.mjs
+++ b/module/data/fields/action/beastformField.mjs
@@ -28,8 +28,7 @@ export default class BeastformField extends fields.SchemaField {
                             { 1: game.i18n.localize('DAGGERHEART.GENERAL.Tiers.1') }
                         );
                     },
-                    label: 'DAGGERHEART.ACTIONS.Config.beastform.exact.label',
-                    hint: 'DAGGERHEART.ACTIONS.Config.beastform.exact.hint'
+                    hint: 'DAGGERHEART.ACTIONS.Config.beastform.exactHint'
                 })
             })
         };
diff --git a/styles/less/dialog/character-creation/selections-container.less b/styles/less/dialog/character-creation/selections-container.less
index f774eb72..1de3d870 100644
--- a/styles/less/dialog/character-creation/selections-container.less
+++ b/styles/less/dialog/character-creation/selections-container.less
@@ -175,11 +175,6 @@
                 opacity: 0.2;
             }
 
-            &.no-horizontal-padding {
-                padding-left: 0;
-                padding-right: 0;
-            }
-
             legend {
                 margin-left: auto;
                 margin-right: auto;
@@ -279,15 +274,6 @@
                 flex-direction: column;
                 gap: 5px;
 
-                &.separated {
-                    border-bottom: 2px solid;
-                    padding-bottom: 8px;
-                }
-
-                .form-group {
-                    padding: 0 0.75rem;
-                }
-
                 .experience-inner-container {
                     position: relative;
                     display: flex;
diff --git a/templates/actionTypes/beastform.hbs b/templates/actionTypes/beastform.hbs
index 3dcdb006..b9bea445 100644
--- a/templates/actionTypes/beastform.hbs
+++ b/templates/actionTypes/beastform.hbs
@@ -1,4 +1,4 @@
 <fieldset>
-    <legend>{{localize "DAGGERHEART.ACTIONS.TYPES.beastform.name"}}</legend>
+    <legend>{{localize "DAGGERHEART.ACTIONS.Config.beastform.label"}}</legend>
     {{formGroup fields.tierAccess.fields.exact value=source.tierAccess.exact name="beastform.tierAccess.exact" labelAttr="label" valueAttr="key" localize=true blank=""}}
 </fieldset>
\ No newline at end of file
diff --git a/templates/characterCreation/tabs/experience.hbs b/templates/characterCreation/tabs/experience.hbs
index 66363084..3eb92834 100644
--- a/templates/characterCreation/tabs/experience.hbs
+++ b/templates/characterCreation/tabs/experience.hbs
@@ -4,25 +4,17 @@
     data-group='{{tabs.experience.group}}'
 >
     <div class="main-selections-container">
-        <fieldset class="section-container no-horizontal-padding">
+        <fieldset class="section-container">
             <legend>{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.initialExperiences"}} {{experience.nrSelected}}/{{experience.nrTotal}}</legend>
             <div class="experiences-inner-container">
                 {{#each experience.values as |experience id|}}
-                    <div class="experience-container {{#unless @last}}separated{{/unless}}">
-                        <div class="form-group">
-                            <label>{{localize "DAGGERHEART.GENERAL.label"}}</label>
-                            <div class="experience-inner-container">
-                                <input class="experience-description" type="text" name="{{concat "experiences." id ".name" }}" value="{{experience.name}}" placeholder="{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.newExperience"}}" />
-                                <span class="experience-value">{{numberFormat this.value sign=true}}</span>
-                            </div>
+                    <div class="experience-container">
+                        <div class="experience-inner-container">
+                            <input class="experience-description" type="text" name="{{concat "experiences." id ".name" }}" value="{{experience.name}}" placeholder="{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.newExperience"}}" />
+                            <span class="experience-value">{{numberFormat this.value sign=true}}</span>
                         </div>
 
-                        <div class="form-group">
-                            <label>{{localize "DAGGERHEART.GENERAL.optionalThing" thing=(localize "DAGGERHEART.GENERAL.description")}}</label>
-                            <div class="form-fields">
-                                <textarea name="{{concat "experiences." id ".description"}}">{{experience.description}}</textarea>
-                            </div>
-                        </div>
+                        <textarea name="{{concat "experiences." id ".description"}}">{{experience.description}}</textarea>
                     </div>
                 {{/each}}
             </div>
diff --git a/templates/dialogs/compendiumBrowserSettingsDialog/footer.hbs b/templates/dialogs/compendiumBrowserSettingsDialog/footer.hbs
index d9bb378e..9dc61cbe 100644
--- a/templates/dialogs/compendiumBrowserSettingsDialog/footer.hbs
+++ b/templates/dialogs/compendiumBrowserSettingsDialog/footer.hbs
@@ -1,3 +1,3 @@
 <footer>
-    <button data-action="finish">{{localize "DAGGERHEART.GENERAL.saveSettings"}}</button>
+    <button data-action="finish">{{localize "Save Settings"}}</button>
 </footer>
\ No newline at end of file
diff --git a/templates/sheets/items/weapon/header.hbs b/templates/sheets/items/weapon/header.hbs
index 2f51d6d3..349a9516 100644
--- a/templates/sheets/items/weapon/header.hbs
+++ b/templates/sheets/items/weapon/header.hbs
@@ -5,9 +5,9 @@
         <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
         <div class='item-description'>
             {{#if source.system.secondary}}
-                <h3>{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full"}}</h3>
+                <h3>{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}</h3>
             {{else}}
-                <h3>{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon.full"}}</h3>
+                <h3>{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}</h3>
             {{/if}}
             <h3>
                 {{localize (concat 'DAGGERHEART.CONFIG.Traits.' source.system.attack.roll.trait '.short')}}
diff --git a/templates/ui/tooltip/battlepoints.hbs b/templates/ui/tooltip/battlepoints.hbs
index f2f42f53..9672698a 100644
--- a/templates/ui/tooltip/battlepoints.hbs
+++ b/templates/ui/tooltip/battlepoints.hbs
@@ -7,9 +7,9 @@
                 {{#each category as |grouping index|}}
                     <div class="battlepoint-grouping-container">
                         {{#if grouping.nr}}
-                            <label>{{key}} {{localize "DAGGERHEART.GENERAL.Battlepoints.short"}} - {{concat (localize grouping.description) ' ' '('grouping.nr 'x)'}}</label>
+                            <label>{{key}} BP: {{concat (localize grouping.description) ' ' '('grouping.nr 'x)'}}</label>
                         {{else}}
-                            <label class="unselected-grouping">{{key}} {{localize "DAGGERHEART.GENERAL.Battlepoints.short"}} - {{localize grouping.description}}</label>
+                            <label class="unselected-grouping">{{key}} BP - {{localize grouping.description}}</label>
                         {{/if}}
                     </div>
                 {{/each}}
@@ -26,7 +26,7 @@
                 {{else}}
                     <input type="checkbox" data-combat-id="{{@root.combatId}}" data-category="{{toggle.categoryKey}}" data-grouping="{{toggle.toggleKey}}" {{checked toggle.checked}} />
                 {{/if}}
-                <label class="unselected-grouping">{{toggle.categoryKey}} {{localize "DAGGERHEART.GENERAL.Battlepoints.short"}}: {{localize toggle.description}}</label>
+                <label class="unselected-grouping">{{toggle.categoryKey}} BP: {{localize toggle.description}}</label>
             </div>
         {{/each}}
     </div>
diff --git a/templates/ui/tooltip/weapon.hbs b/templates/ui/tooltip/weapon.hbs
index 4adb9c46..a672c883 100644
--- a/templates/ui/tooltip/weapon.hbs
+++ b/templates/ui/tooltip/weapon.hbs
@@ -3,7 +3,7 @@
     <h2 class="tooltip-title">{{item.name}}</h2>
     <div class="tags">
         <div class="tag">
-            <span>{{#if item.system.secondary}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon.full"}}{{/if}}</span>
+            <span>{{#if item.system.secondary}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}{{/if}}</span>
         </div>
         <div class="tag">
             {{#with (lookup config.GENERAL.burden item.system.burden) as | burden |}}