diff --git a/app/manifest.json b/app/manifest.json
index 3a7c42e..e51074c 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -30,7 +30,7 @@
 		"https://*/*"
 	],
 	"web_accessible_resources" : ["Sdk.Soap.min.js","levelup.extension.js"],
-	"version" : "3.3.0",
-	"version_name" : "3.3.0",
+	"version" : "3.3.1",
+	"version_name" : "3.3.1",
 	"manifest_version" : 2
 }
\ No newline at end of file
diff --git a/app/pages/options.html b/app/pages/options.html
index eb30976..8939ba7 100644
--- a/app/pages/options.html
+++ b/app/pages/options.html
@@ -104,8 +104,6 @@
             <div class="links" id="environmentDetails">Org Settings</div>
             <div class="links" id="myRoles">My Roles</div>
             <div class="links" id="allUserRoles">Users &amp; Roles</div>
-            <div class="links" id="lightUpNavigation">Enable new navigation</div>
-            <div class="links" id="classicNavigation">Disable new navigation</div>
         </div>
     </div>
     <script src="options.js"></script>
diff --git a/app/scripts/app/app.ts b/app/scripts/app/app.ts
index 490c3ee..d4d4f7d 100644
--- a/app/scripts/app/app.ts
+++ b/app/scripts/app/app.ts
@@ -42,6 +42,7 @@ module LevelUp{
                     if (contentPanels && contentPanels.length > 0) {
                         let formDocument = contentPanels[0].contentWindow.document;
                         if(formDocument.querySelector("#crmFormHeaderTop") 
+                            || document.querySelector('div[data-id="editFormRoot"]')
                             || document.querySelector("#editFormRoot")) {
                             response(types.AreaType.Form);
                         }
diff --git a/app/scripts/inject/levelup.forms.ts b/app/scripts/inject/levelup.forms.ts
index b087089..a69b052 100644
--- a/app/scripts/inject/levelup.forms.ts
+++ b/app/scripts/inject/levelup.forms.ts
@@ -142,6 +142,7 @@ module LevelUp {
           var dirtyAttribute = c.getAttribute();
           if (!dirtyAttribute || !dirtyAttribute.getIsDirty()) return;
           var attributeNode = this.utility.formWindow.document.getElementById(dirtyAttribute.getName()) ||
+                              this.utility.formDocument.querySelector(`div[data-id="${dirtyAttribute.getName()}-FieldSectionItemContainer"]`) ||
                               this.utility.formDocument.querySelector(`label[id$="${dirtyAttribute.getName()}-field-label"]`);
           if(!attributeNode) return;
 
diff --git a/package-lock.json b/package-lock.json
index 7c88078..8bafbf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Levelup-for-Dynamics-CRM-365",
-  "version": "3.0.0",
+  "version": "3.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4811,8 +4811,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4826,21 +4825,19 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.6"
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
           }
         },
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4855,20 +4852,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4924,14 +4918,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "1.2.0",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
           }
         },
         "glob": {
@@ -4940,12 +4934,12 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "has-unicode": {
@@ -4978,15 +4972,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "once": "^1.3.0",
+            "wrappy": "1"
           }
         },
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4998,7 +4991,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5013,7 +5005,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5116,17 +5107,16 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
           }
         },
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5138,9 +5128,8 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
-            "wrappy": "1.0.2"
+            "wrappy": "1"
           }
         },
         "os-homedir": {
@@ -5203,13 +5192,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "rimraf": {
@@ -5260,7 +5249,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5280,7 +5268,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5318,14 +5305,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "1.0.2"
+            "string-width": "^1.0.2"
           }
         },
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
diff --git a/package.json b/package.json
index 2566e49..354c213 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Levelup-for-Dynamics-CRM-365",
   "private": true,
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Quickly perform advanced/hidden actions in Dynamics CRM/365, without bookmarklets.",
   "scripts": {
     "clean": "gulp clean --vendor=chrome & gulp clean --vendor=firefox & gulp clean --vendor=edge",