diff --git a/README.md b/README.md
index 23abf94..a36d4a4 100755
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
-# Animaide 1.0.3
+# Animaide 1.0.38
 
 *CurveTools* - *AnimOffset* - *KeyManager*
 
 **Tested with Blender 2.93 and up.**
 
 **Seems to be working fine with NLA now**
+
+> **Warning:** 
+> *AnimOffset is on the headers by default now, but that can be changed in the addon preferences*
+
 ###
 
  ![Shortcut Troubleshoot](images/animaide.jpg)
@@ -20,8 +24,9 @@
 ##
 
 > ### New on this version:
->
+> 
 > **In General:**
+> - *Bug fixes*
 > - Some settings were moved to the addon preferences. By being there your options will persist even after the Blender 
     session is over.
 > - A new group of tools called **KeyManager** has been added to its own panel.
diff --git a/anim_offset/ui.py b/anim_offset/ui.py
index 425d450..bc84503 100755
--- a/anim_offset/ui.py
+++ b/anim_offset/ui.py
@@ -49,7 +49,7 @@ def draw(self, context):
 
         row = layout.row(align=True)
 
-        if context.area.type != 'VIEW_3D':
+        if context.area.type != 'VIEW_3D' or context.area.type != 'NLA_EDITOR':
 
             if mask_in_use:
                 row.operator("anim.aide_delete_anim_offset_mask", text='Deactivate Mask', depress=True, icon='SELECT_SUBTRACT')
diff --git a/prefe.py b/prefe.py
index 4296c4f..5849161 100644
--- a/prefe.py
+++ b/prefe.py
@@ -163,7 +163,7 @@ def toggle_tool_markers(self, context):
         items=[('PANEL', 'Panel', 'Choose if you want "Anim Offset" on a panel', '', 1),
                ('HEADERS', 'Headers', 'Choose if you want "Anim Offset" tools on headers', '', 2)],
         name="Anim Offset",
-        default='PANEL',
+        default='HEADERS',
         update=anim_offset_update
     )
 
diff --git a/ui.py b/ui.py
index 08bbe1a..4042c30 100755
--- a/ui.py
+++ b/ui.py
@@ -90,22 +90,23 @@ def poll(cls, context):
     def draw(self, context):
         layout = self.layout
 
-        if context.area.type != 'DOPESHEET_EDITOR':
-            if context.area.type == 'GRAPH_EDITOR':
-                layout.menu('ANIMAIDE_MT_curve_tools_pie')
+        if context.area.type == 'VIEW_3D':
+            layout.menu('ANIMAIDE_MT_curve_tools', text='On Frame Curve Tools')
+            layout.separator()
+            layout.menu('ANIMAIDE_MT_anim_offset')
 
-            if context.area.type == 'VIEW_3D':
-                layout.menu('ANIMAIDE_MT_curve_tools', text='On Frame Curve Tools')
-            else:
-                layout.menu('ANIMAIDE_MT_curve_tools')
-                layout.menu('ANIMAIDE_MT_tweak')
+        elif context.area.type == 'DOPESHEET_EDITOR':
+            layout.operator('wm.call_menu_pie', text="Pie AnimOffset").name = 'ANIMAIDE_MT_pie_anim_offset'
+            layout.menu('ANIMAIDE_MT_anim_offset')
+            layout.menu('ANIMAIDE_MT_anim_offset_mask')
 
+        elif context.area.type == 'GRAPH_EDITOR':
+            layout.menu('ANIMAIDE_MT_curve_tools_pie')
+            layout.menu('ANIMAIDE_MT_curve_tools')
+            layout.menu('ANIMAIDE_MT_tweak')
             layout.separator()
-
-        if context.area.type != 'VIEW_3D':
             layout.operator('wm.call_menu_pie', text="Pie AnimOffset").name = 'ANIMAIDE_MT_pie_anim_offset'
-        layout.menu('ANIMAIDE_MT_anim_offset')
-        if context.area.type != 'VIEW_3D':
+            layout.menu('ANIMAIDE_MT_anim_offset')
             layout.menu('ANIMAIDE_MT_anim_offset_mask')