diff --git a/src/module.json b/src/module.json
index a1085ea..87923fe 100644
--- a/src/module.json
+++ b/src/module.json
@@ -1,56 +1,52 @@
 {
-	"name": "compact-beyond-5e-sheet",
-	"title": "Compact DnDBeyond 5e Character Sheet",
-	"description": "A compact 5e character sheet with similar layout and functionality to dndbeyond's.",
-	"systems": ["dnd5e"],
-	"version": "0.11.1",
-	"author": "Andrew Krigline (akrigline)",
-	"esmodules": [
-		"foundryvtt-compactBeyond5eSheet.js"
-	],
-	"styles": [
-		"foundryvtt-compactBeyond5eSheet.css"
-	],
-	"languages": [
-		{
-			"lang": "en",
-			"name": "English",
-			"path": "lang/en.json"
-		}
-	],
-	"media": [
-		{
-			"type": "cover",
-			"link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/cover-image.png"
-		},
-		{
-			"type": "screenshot",
-			"link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/main-view.png"
-		},
-		{
-			"type": "screenshot",
-			"link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/inventory.png"
-		},
-		{
-			"type": "screenshot",
-			"link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/spellbook.png"
-		},
-		{
-			"type": "screenshot",
-			"link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/features.png"
-		},
-		{
-			"type": "screenshot",
-			"link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/biography.png"
-		}
-	],
-	"minimumCoreVersion": "0.7.6",
-	"compatibleCoreVersion": "0.7.8",
-	"minimumSystemVersion": 0.99,
-	"bugs": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/issues",
-	"changelog": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/releases",
-	"download": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/releases/download/v0.11.1/module.zip",
-	"manifest": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/releases/latest/download/module.json",
-	"readme": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/README.md",
-	"url": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet"
-}
\ No newline at end of file
+  "name": "compact-beyond-5e-sheet",
+  "title": "Compact DnDBeyond 5e Character Sheet",
+  "description": "A compact 5e character sheet with similar layout and functionality to dndbeyond's.",
+  "systems": ["dnd5e"],
+  "version": "0.11.1",
+  "author": "Andrew Krigline (akrigline)",
+  "esmodules": ["foundryvtt-compactBeyond5eSheet.js"],
+  "styles": ["foundryvtt-compactBeyond5eSheet.css"],
+  "languages": [
+    {
+      "lang": "en",
+      "name": "English",
+      "path": "lang/en.json"
+    }
+  ],
+  "media": [
+    {
+      "type": "cover",
+      "link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/cover-image.png"
+    },
+    {
+      "type": "screenshot",
+      "link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/main-view.png"
+    },
+    {
+      "type": "screenshot",
+      "link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/inventory.png"
+    },
+    {
+      "type": "screenshot",
+      "link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/spellbook.png"
+    },
+    {
+      "type": "screenshot",
+      "link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/features.png"
+    },
+    {
+      "type": "screenshot",
+      "link": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/readme-img/biography.png"
+    }
+  ],
+  "minimumCoreVersion": "0.7.6",
+  "compatibleCoreVersion": "0.7.8",
+  "minimumSystemVersion": 0.99,
+  "bugs": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/issues",
+  "changelog": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/releases",
+  "download": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/releases/download/v0.11.1/module.zip",
+  "manifest": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/releases/latest/download/module.json",
+  "readme": "https://raw.githubusercontent.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet/master/README.md",
+  "url": "https://github.com/ElfFriend-DnD/foundryvtt-compactBeyond5eSheet"
+}
diff --git a/src/templates/character-sheet.hbs b/src/templates/character-sheet.hbs
index 714391c..3766a2e 100644
--- a/src/templates/character-sheet.hbs
+++ b/src/templates/character-sheet.hbs
@@ -40,7 +40,8 @@
       <footer class="attribute-footer">
         <span class="movement-special" title="{{movement.special}}">{{movement.special}}</span>
       </footer>
-      <a class="configure-movement" title="{{localize 'DND5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
+      <a class="configure-movement config-button" data-action="movement" title="{{localize 'DND5E.MovementConfig'}}"><i
+          class="fas fa-cog"></i></a>
     </li>
   </ul>
 
diff --git a/src/templates/parts/actor-inventory.hbs b/src/templates/parts/actor-inventory.hbs
index 7a620f0..4e5330a 100644
--- a/src/templates/parts/actor-inventory.hbs
+++ b/src/templates/parts/actor-inventory.hbs
@@ -84,7 +84,8 @@
         <h4>
           {{item.name~}}
           {{~#if item.isStack}} ({{item.data.quantity}}){{/if}}
-          {{~#if item.data.attuned}} <i class="fas fa-sun attuned" title={{localize "DND5E.Attuned"}}></i>{{/if}}
+          {{~#if (or item.data.attuned (eq data.attunement 2))}} <i class="fas fa-sun attuned"
+            title={{localize "DND5E.Attuned"}}></i>{{/if}}
         </h4>
         {{/if}}
       </div>
diff --git a/src/templates/parts/actor-traits.hbs b/src/templates/parts/actor-traits.hbs
index 472f087..dfec674 100644
--- a/src/templates/parts/actor-traits.hbs
+++ b/src/templates/parts/actor-traits.hbs
@@ -112,7 +112,8 @@
   {{#unless isVehicle}}
   <div class="form-group ">
     <label>{{localize "DND5E.SpecialTraits"}}</label>
-    <a class="configure-flags"><i class="fas fa-cog"></i></a>
+    <a class="configure-flags config-button" data-action="flags" title="{{localize 'DND5E.SpecialTraits'}}"><i
+        class="fas fa-cog"></i></a>
   </div>
   {{/unless}}
 </div>
\ No newline at end of file