diff --git a/Assets/MirageXR/Common/Scripts/CombinedEditor/ActionDetailView/Annotation Editors/GhostRecorder.cs b/Assets/MirageXR/Common/Scripts/CombinedEditor/ActionDetailView/Annotation Editors/GhostRecorder.cs
index 8d9546599..344477454 100644
--- a/Assets/MirageXR/Common/Scripts/CombinedEditor/ActionDetailView/Annotation Editors/GhostRecorder.cs	
+++ b/Assets/MirageXR/Common/Scripts/CombinedEditor/ActionDetailView/Annotation Editors/GhostRecorder.cs	
@@ -1,19 +1,22 @@
+using Microsoft.MixedReality.Toolkit;
+using Microsoft.MixedReality.Toolkit.Input;
+using Microsoft.MixedReality.Toolkit.Utilities;
+using MirageXR;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
-using Microsoft.MixedReality.Toolkit.Utilities;
-using MirageXR;
 using UnityEngine;
-using Microsoft.MixedReality.Toolkit.Input;
 
 public class GhostRecorder
 {
     public bool IsRecording => _isRecording;
     public GhostDataFrame LastFrame => _lastFrame;
 
+    private IMixedRealityHandJointService handJointService;
+
     private readonly List<GhostDataFrame> _ghostFrames = new List<GhostDataFrame>();
 
     private GhostDataFrame _lastFrame;
@@ -90,6 +93,8 @@ public void Start(Transform anchor, Transform camera, float? cooldown = null)
         _ghostFrames.Clear();
         _isRecording = true;
 
+        handJointService = CoreServices.GetInputSystemDataProvider<IMixedRealityHandJointService>();
+
         StartAsync();
     }
 
@@ -137,18 +142,60 @@ private void RecordFrame()
             lowerSpine = CreateLocalPose(_anchor, GetLowerSpinPosition(_cameraTransform), cameraRotation),
         };
 
+        var zeroPose = new Pose{position = Vector3.zero,rotation = Quaternion.identity};
+
         if (InputRayUtils.TryGetHandRay(Handedness.Right, out var rightHandRay))
         {
             var rotation = Quaternion.LookRotation(rightHandRay.direction, Vector3.up);
             _lastFrame.rightHand = CreateLocalPose(_anchor, rightHandRay.origin, rotation);
+
+            if (handJointService != null)
+            {
+                _lastFrame.rightThumbTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.ThumbTip, Handedness.Right));
+                _lastFrame.rightIndexTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.IndexTip, Handedness.Right));
+                _lastFrame.rightMiddleTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.MiddleTip, Handedness.Right));
+                _lastFrame.rightRingTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.RingTip, Handedness.Right));
+                _lastFrame.rightPinkyTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.PinkyTip, Handedness.Right));
+            }
+            else
+            {
+                _lastFrame.rightThumbTip = zeroPose;
+                _lastFrame.rightIndexTip = zeroPose;
+                _lastFrame.rightMiddleTip = zeroPose;
+                _lastFrame.rightRingTip = zeroPose;
+                _lastFrame.rightPinkyTip = zeroPose;
+            }
         }
 
         if (InputRayUtils.TryGetHandRay(Handedness.Left, out var leftHandRay))
         {
             var rotation = Quaternion.LookRotation(leftHandRay.direction, Vector3.up);
             _lastFrame.leftHand = CreateLocalPose(_anchor, leftHandRay.origin, rotation);
+
+            if (handJointService != null)
+            {
+                _lastFrame.leftThumbTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.ThumbTip, Handedness.Left));
+                _lastFrame.leftIndexTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.IndexTip, Handedness.Left));
+                _lastFrame.leftMiddleTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.MiddleTip, Handedness.Left));
+                _lastFrame.leftRingTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.RingTip, Handedness.Left));
+                _lastFrame.leftPinkyTip = CreateLocalPose(_anchor, handJointService.RequestJointTransform(TrackedHandJoint.PinkyTip, Handedness.Left));
+
+                Debug.Log("Left index " + _lastFrame.leftIndexTip.position);
+                Debug.Log("Left thumb " + _lastFrame.leftThumbTip.position);
+                Debug.Log("Left Pinky " + _lastFrame.leftPinkyTip.position);
+            }
+            else
+            {
+                _lastFrame.leftThumbTip = zeroPose;
+                _lastFrame.leftIndexTip = zeroPose;
+                _lastFrame.leftMiddleTip = zeroPose;
+                _lastFrame.leftRingTip = zeroPose;
+                _lastFrame.leftPinkyTip = zeroPose;
+            }
         }
 
+
+
         _ghostFrames.Add(_lastFrame);
     }
 
@@ -161,6 +208,15 @@ private static Pose CreateLocalPose(Transform anchor, Vector3 position, Quaterni
         };
     }
 
+    private static Pose CreateLocalPose(Transform anchor, Transform transform)
+    {
+        return new Pose
+        {
+            position = anchor.InverseTransformPoint(transform.position),
+            rotation = Quaternion.Inverse(anchor.parent.localRotation) * transform.rotation,
+        };
+    }    
+
     private static Vector3 GetHeadPosition(Transform camera)
     {
         return camera.position;
@@ -185,4 +241,5 @@ private static Vector3 GetLowerSpinPosition(Transform camera)
     {
         return camera.position + (camera.up * -0.45f);
     }
+
 }
\ No newline at end of file
diff --git a/Assets/MirageXR/Common/Scripts/CombinedEditor/ActionDetailView/Annotation Editors/PickAndPlace/PickAndPlaceController.cs b/Assets/MirageXR/Common/Scripts/CombinedEditor/ActionDetailView/Annotation Editors/PickAndPlace/PickAndPlaceController.cs
index 08c14ead0..ddd79c84d 100644
--- a/Assets/MirageXR/Common/Scripts/CombinedEditor/ActionDetailView/Annotation Editors/PickAndPlace/PickAndPlaceController.cs	
+++ b/Assets/MirageXR/Common/Scripts/CombinedEditor/ActionDetailView/Annotation Editors/PickAndPlace/PickAndPlaceController.cs	
@@ -1,8 +1,8 @@
-using System;
+using Microsoft.MixedReality.Toolkit.UI;
+using Microsoft.MixedReality.Toolkit.UI.BoundsControl;
+using System;
 using System.Collections;
 using System.IO;
-using Microsoft.MixedReality.Toolkit.UI;
-using Microsoft.MixedReality.Toolkit.UI.BoundsControl;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -189,6 +189,13 @@ private IEnumerator LoadMyModel(string MyModelID)
             while (newModel == null)
             {
                 newModel = GameObject.Find(MyModelID);
+
+                yield return null;
+            }
+
+            //wait for model component to be added
+            while (!newModel.GetComponentInChildren<Model>())
+            {
                 yield return null;
             }
 
diff --git a/Assets/MirageXR/Common/Scripts/DataModel/ContentType.cs b/Assets/MirageXR/Common/Scripts/DataModel/ContentType.cs
index b35d31772..896110ec2 100644
--- a/Assets/MirageXR/Common/Scripts/DataModel/ContentType.cs
+++ b/Assets/MirageXR/Common/Scripts/DataModel/ContentType.cs
@@ -185,6 +185,8 @@ public static string GetPredicate(this ContentType type)
     public static ContentType ParsePredicate(string predicate)
     {
         var predicateLowCase = predicate.ToLower();
+        if (predicateLowCase.StartsWith(PREDICATE_IMAGEMARKER))
+            return ContentType.IMAGEMARKER;
         if (predicateLowCase.StartsWith(PREDICATE_IMAGE))
             return ContentType.IMAGE;
         if (predicateLowCase.StartsWith(PREDICATE_VIDEO))
@@ -205,8 +207,6 @@ public static ContentType ParsePredicate(string predicate)
             return ContentType.CHARACTER;
         if (predicateLowCase.StartsWith(PREDICATE_PICKANDPLACE) || predicateLowCase.StartsWith(PREDICATE_PICKANDPLACE_V2))
             return ContentType.PICKANDPLACE;
-        if (predicateLowCase.StartsWith(PREDICATE_IMAGEMARKER))
-            return ContentType.IMAGEMARKER;
         if (predicateLowCase.StartsWith(PREDICATE_PLUGIN))
             return ContentType.PLUGIN;
         if (predicateLowCase.StartsWith(PREDICATE_DRAWING))
diff --git a/Assets/MirageXR/Common/Scripts/DataModel/GhostDataFrame.cs b/Assets/MirageXR/Common/Scripts/DataModel/GhostDataFrame.cs
index 2fbd42e45..97f5ee677 100644
--- a/Assets/MirageXR/Common/Scripts/DataModel/GhostDataFrame.cs
+++ b/Assets/MirageXR/Common/Scripts/DataModel/GhostDataFrame.cs
@@ -11,5 +11,18 @@ public struct GhostDataFrame
         public Pose rightHand;
         public Pose upperSpine;
         public Pose lowerSpine;
+
+        public Pose leftThumbTip;
+        public Pose leftIndexTip;
+        public Pose leftMiddleTip;
+        public Pose leftRingTip;
+        public Pose leftPinkyTip;
+
+        public Pose rightThumbTip;
+        public Pose rightIndexTip;
+        public Pose rightMiddleTip;
+        public Pose rightRingTip;
+        public Pose rightPinkyTip;
+
     }
 }
\ No newline at end of file
diff --git a/Assets/MirageXR/Player/Prefabs/Glyphs/Allow.prefab b/Assets/MirageXR/Player/Prefabs/Glyphs/Allow.prefab
index c2699eaf1..68a7dc237 100644
--- a/Assets/MirageXR/Player/Prefabs/Glyphs/Allow.prefab
+++ b/Assets/MirageXR/Player/Prefabs/Glyphs/Allow.prefab
@@ -28,6 +28,7 @@ Transform:
   m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
   m_LocalPosition: {x: -0, y: 0.13006982, z: 0.047869273}
   m_LocalScale: {x: 8.694114, y: 1.1370173, z: 8.694114}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4344669209980684}
   m_RootOrder: 1
@@ -51,6 +52,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -110,6 +112,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4919262433461562}
   - {fileID: 4509004889423960}
@@ -127,7 +130,7 @@ SphereCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Radius: 0.1
+  m_Radius: 0.088
   m_Center: {x: 0, y: 0.13, z: 0.05}
 --- !u!114 &4489515686483770652
 MonoBehaviour:
@@ -171,6 +174,7 @@ Transform:
   m_LocalRotation: {x: 6.123234e-17, y: 1, z: -6.123234e-17, w: -6.123234e-17}
   m_LocalPosition: {x: 0.0018114226, y: 0.13064528, z: 0.036404494}
   m_LocalScale: {x: 1.0969888, y: 1.0969888, z: 1.0969888}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4344669209980684}
   m_RootOrder: 0
@@ -194,6 +198,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
diff --git a/Assets/MirageXR/Player/Prefabs/Glyphs/Highlight.prefab b/Assets/MirageXR/Player/Prefabs/Glyphs/Highlight.prefab
index 7912ebb1c..7304782f0 100644
--- a/Assets/MirageXR/Player/Prefabs/Glyphs/Highlight.prefab
+++ b/Assets/MirageXR/Player/Prefabs/Glyphs/Highlight.prefab
@@ -28,6 +28,7 @@ Transform:
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1.0735172, y: 0.36896116, z: 1.0735172}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4445959038434004}
   m_RootOrder: 0
@@ -51,6 +52,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -109,6 +111,7 @@ Transform:
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 0.102197826, y: 0.102197826, z: 0.102197826}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4445959038434004}
   m_RootOrder: 2
@@ -132,6 +135,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -190,6 +194,7 @@ Transform:
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 0.1419927, y: 0.011449032, z: 0.1419927}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4445959038434004}
   m_RootOrder: 1
@@ -213,6 +218,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -269,6 +275,7 @@ Transform:
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 6, y: 6, z: 6}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4434641981235558}
   - {fileID: 4931138640069592}
@@ -305,6 +312,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 6.734729, y: -27.978905, z: 65.44355}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4445959038434004}
   m_Father: {fileID: 0}
@@ -312,7 +320,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &95786942195654902
 Animator:
-  serializedVersion: 3
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -325,6 +333,7 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -340,7 +349,7 @@ SphereCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Radius: 0.11
+  m_Radius: 0.102
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &1213084481959375109
 MonoBehaviour:
diff --git a/Assets/MirageXR/Player/Scripts/Augmentations/AudioPlayer/AudioPlayer.cs b/Assets/MirageXR/Player/Scripts/Augmentations/AudioPlayer/AudioPlayer.cs
index c832f6452..f3292ead8 100644
--- a/Assets/MirageXR/Player/Scripts/Augmentations/AudioPlayer/AudioPlayer.cs
+++ b/Assets/MirageXR/Player/Scripts/Augmentations/AudioPlayer/AudioPlayer.cs
@@ -1,5 +1,4 @@
-using i5.Toolkit.Core.VerboseLogging;
-using System.Collections;
+using System.Collections;
 using UnityEngine;
 
 namespace MirageXR
@@ -192,20 +191,19 @@ private static IEnumerator ActivateTrigger(AudioSource audioSource, Trigger trig
                 var triggerDuration = trigger.duration;
                 yield return new WaitForSeconds(triggerDuration);
 
-                if (!activityManager.IsLastAction(activityManager.ActiveAction))
-                {
-                    if (activityManager.ActiveAction != null)
-                    {
-                        activityManager.ActiveAction.isCompleted = true;
-                    }
 
-                    if (int.TryParse(trigger.value, out var stepNumber))
-                    {
-                        activityManager.ActivateActionByIndex(stepNumber - 1);
-                    }
+                if (activityManager.ActiveAction != null)
+                {
+                    activityManager.ActiveAction.isCompleted = true;
+                }
 
-                    TaskStationDetailMenu.Instance.SelectedButton = null;
+                if (int.TryParse(trigger.value, out var stepNumber))
+                {
+                    activityManager.ActivateActionByIndex(stepNumber - 1);
                 }
+
+                TaskStationDetailMenu.Instance.SelectedButton = null;
+
             }
         }
 
diff --git a/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/AudioEditorView.cs b/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/AudioEditorView.cs
index 4ad03f75c..8a4e9a74a 100644
--- a/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/AudioEditorView.cs
+++ b/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/AudioEditorView.cs
@@ -1,8 +1,8 @@
-using System;
+using DG.Tweening;
+using MirageXR;
+using System;
 using System.Collections;
 using System.IO;
-using DG.Tweening;
-using MirageXR;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -36,6 +36,8 @@ public class IntHolder : ObjectHolder<int> { }
     [SerializeField] private Toggle _toggleLoop;
     [SerializeField] private Button _btnIncreaseRange;
     [SerializeField] private Button _btnDecreaseRange;
+    [SerializeField] private Toggle _toggleTrigger;
+    [SerializeField] private GameObject _objJumpToStep;
 
     [SerializeField] private TMP_Text _txtSliderRangeValue;
     [SerializeField] private GameObject _panelRange;
@@ -69,6 +71,7 @@ public class IntHolder : ObjectHolder<int> { }
     private Coroutine _updateSliderPlayerCoroutine;
     private Coroutine _updateRecordTimerCoroutine;
     private float _recordStartTime;
+    private int _scrollRectStep;
 
     private string _inputTriggerStepNumber = string.Empty;
 
@@ -101,6 +104,7 @@ public override void Initialization(Action<PopupBase> onClose, params object[] a
         _btnIncreaseRange.onClick.AddListener(OnIncreaseRange);
         _btnDecreaseRange.onClick.AddListener(OnDecreaseRange);
         _btnRecordComplete.onClick.AddListener(OnClickRecordComplete);
+        _toggleTrigger.onValueChanged.AddListener(OnToggleTriggerValueChanged);
 
         _sliderPlayer.minValue = 0;
         _sliderPlayer.maxValue = 1f;
@@ -121,12 +125,16 @@ public override void Initialization(Action<PopupBase> onClose, params object[] a
             if (trigger != null)
             {
                 _inputTriggerStepNumber = trigger.value;
+                _scrollRectStep = int.Parse(_inputTriggerStepNumber) - 1;
+                _toggleTrigger.isOn = true;
             }
+            OnClickRecordComplete();
         }
         else
         {
             _fileName = $"MirageXR_Audio_{DateTime.Now.ToFileTimeUtc()}.wav";
             _groupPlayControls.interactable = false;
+            OnClickCancel();
         }
 
         SetPlayerActive(true);
@@ -149,7 +157,7 @@ private void InitClampedScrollRect(ClampedScrollRect clampedScrollRect, GameObje
 
             if (steps[i - 1].id == currentActionId)
             {
-                _clampedScrollJumpToStep.currentItemIndex = i;
+                _scrollRectStep = i - 1;
             }
         }
     }
@@ -260,6 +268,7 @@ private void OnClickRecordComplete()
         _panelRecordControls.SetActive(false);
         _panelBottomButtons.SetActive(true);
         _panelRecordComplete.SetActive(false);
+        _panelAudioSettings.SetActive(false);
         _txtTimerTo.text = ToTimeFormatMinutes(_audioClip.length);
     }
 
@@ -410,12 +419,18 @@ private void OnOpenAudioSettings()
         _panelPlayRecord.SetActive(false);
         _panelBottomButtons.SetActive(false);
         _panelAudioSettings.SetActive(true);
+
+        _objJumpToStep.SetActive(true);
+        _clampedScrollJumpToStep.currentItemIndex = _scrollRectStep;
+        _objJumpToStep.SetActive(_toggleTrigger.isOn);
+
     }
 
     private void OnClickCancel()
     {
         _panelPlayRecord.SetActive(false);
         _panelBottomButtons.SetActive(false);
+        _panelAudioSettings.SetActive(false);
         _panelRecordControls.SetActive(true);
         _txtTimer.text = ToTimeFormat(0);
     }
@@ -451,7 +466,14 @@ protected override void OnAccept()
         _content.scale = 0.5f;
         _content.url = $"http://{_fileName}";
 
-        _step.AddOrReplaceArlemTrigger(TriggerMode.Audio, ActionType.Audio, _content.poi, _audioClip.length, _inputTriggerStepNumber);
+        if (_toggleTrigger.isOn)
+        {
+            _step.AddOrReplaceArlemTrigger(TriggerMode.Audio, ActionType.Audio, _content.poi, _audioClip.length, _inputTriggerStepNumber);
+        }
+        else
+        {
+            _step.RemoveArlemTrigger(_content);
+        }
 
         SaveLoadAudioUtilities.Save(filePath, _audioClip);
 
@@ -477,4 +499,9 @@ private void OnArrowButtonPressed()
             _arrowUp.SetActive(false);
         }
     }
+
+    private void OnToggleTriggerValueChanged(bool value)
+    {
+        _objJumpToStep.SetActive(value);
+    }
 }
diff --git a/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/LabelEditorView.cs b/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/LabelEditorView.cs
index a0bba019d..6cac62498 100644
--- a/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/LabelEditorView.cs
+++ b/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/LabelEditorView.cs
@@ -37,7 +37,6 @@ public class IntHolder : ObjectHolder<int> { }
     [SerializeField] private Image _backgroundColourButtonImage;
     [SerializeField] private TMP_Text _fontSizeText;
     [Space]
-    [SerializeField] private Button _btnArrow;
     [SerializeField] private RectTransform _panel;
     [SerializeField] private GameObject _arrowDown;
     [SerializeField] private GameObject _arrowUp;
@@ -60,7 +59,6 @@ public override void Initialization(Action<PopupBase> onClose, params object[] a
         _toggleBillboard.onValueChanged.AddListener(OnBillboardValueChanged);
         _btnIncreaseGazeDuration.onClick.AddListener(OnIncreaseGazeDuration);
         _btnDecreaseGazeDuration.onClick.AddListener(OnDecreaseGazeDuration);
-        _btnArrow.onClick.AddListener(OnArrowButtonPressed);
         _clampedScrollJumpToStep.onItemChanged.AddListener(OnItemJumpToStepChanged);
 
         _fontSizeButton.onClick.AddListener(ShowFontSizePanel);
@@ -71,10 +69,10 @@ public override void Initialization(Action<PopupBase> onClose, params object[] a
         var stepsCount = steps.Count;
         InitClampedScrollRect(_clampedScrollJumpToStep, _templatePrefab, stepsCount, stepsCount.ToString());
 
-        _toggleTrigger.isOn = false;
         _gazeDurationPanel.SetActive(false);
 
         UpdateView();
+        _clampedScrollObject.SetActive(_toggleTrigger.isOn);
         RootView_v2.Instance.HideBaseView();
     }
 
@@ -105,6 +103,7 @@ private void UpdateView()
                 _toggleTrigger.isOn = true;
                 _triggerStepIndex = int.Parse(_trigger.value) - 1;
                 _gazeDuration = _trigger.duration;
+                _clampedScrollJumpToStep.currentItemIndex = _triggerStepIndex;
             }
 
             if (_content.option != "")
@@ -137,7 +136,7 @@ private void InitClampedScrollRect(ClampedScrollRect clampedScrollRect, GameObje
 
             if (steps[i - 1].id == currentActionId)
             {
-                _clampedScrollJumpToStep.currentItemIndex = i;
+                _clampedScrollJumpToStep.currentItemIndex = i - 1;
             }
         }
     }
diff --git a/Assets/MirageXR/Player/Scripts/Moodle/MoodleManager.cs b/Assets/MirageXR/Player/Scripts/Moodle/MoodleManager.cs
index fd91bddc6..a49f22236 100644
--- a/Assets/MirageXR/Player/Scripts/Moodle/MoodleManager.cs
+++ b/Assets/MirageXR/Player/Scripts/Moodle/MoodleManager.cs
@@ -304,7 +304,8 @@ public async Task UpdateViewsOfActivity(string itemID)
             if (!result || response.StartsWith("Error"))
             {
                 var maxLenght = 200;
-                Debug.LogError("[MoodleManager] error while increasing the hit counter of the activity: " + (response.Length > maxLenght ? response.Substring(0, maxLenght) : response));
+                var responseLength = response.Length > maxLenght ? response.Substring(0, maxLenght) : response;
+                Debug.LogError("[MoodleManager] error while increasing the hit counter of the activity:" + responseLength);
             }
             else
             {
diff --git a/Assets/MirageXR/Tests/NewUI/LoginView_v2.cs b/Assets/MirageXR/Tests/NewUI/LoginView_v2.cs
index 48baef427..c1ddc172a 100644
--- a/Assets/MirageXR/Tests/NewUI/LoginView_v2.cs
+++ b/Assets/MirageXR/Tests/NewUI/LoginView_v2.cs
@@ -1,7 +1,7 @@
-using System;
+using MirageXR;
+using System;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using MirageXR;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -159,7 +159,26 @@ private static bool IsValidUsername(string value)
     {
         const string regexExpression = "^\\S{3,}$";
         var regex = new Regex(regexExpression);
-        return regex.IsMatch(value);
+        var isValid = regex.IsMatch(value);
+
+        const string MatchEmailPattern =
+                            @"^(([\w-]+\.)+[\w-]+|([a-zA-Z]{1}|[\w-]{2,}))@"
+                            + @"((([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\."
+                            + @"([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])){1}|"
+                            + @"([a-zA-Z]+[\w-]+\.)+[a-zA-Z]{2,4})$";
+
+        regex = new Regex(MatchEmailPattern);
+
+        var isEmail = regex.IsMatch(value);
+
+        if (isEmail || !isValid)
+        {
+            return false;
+        }
+        else
+        {
+            return true;
+        }
     }
 
     private static bool IsValidPassword(string value)
@@ -168,4 +187,24 @@ private static bool IsValidPassword(string value)
         var regex = new Regex(regexExpression);
         return regex.IsMatch(value);
     }
+
+    private static bool IsAnEmail(string email)
+    {
+        const string MatchEmailPattern =
+        @"^(([\w-]+\.)+[\w-]+|([a-zA-Z]{1}|[\w-]{2,}))@"
+        + @"((([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\."
+        + @"([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])){1}|"
+        + @"([a-zA-Z]+[\w-]+\.)+[a-zA-Z]{2,4})$";
+
+        var regex = new Regex(MatchEmailPattern);
+
+        if (email != null)
+        {
+            return regex.IsMatch(email);
+        }
+        else
+        {
+            return false;
+        }
+    }
 }
diff --git a/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/AudioEditor_v2.prefab b/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/AudioEditor_v2.prefab
index f77d17c86..80bcca152 100644
--- a/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/AudioEditor_v2.prefab
+++ b/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/AudioEditor_v2.prefab
@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7256290056673645646
 RectTransform:
   m_ObjectHideFlags: 0
@@ -467,10 +467,10 @@ RectTransform:
   m_Father: {fileID: 1807377057581014701}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 539.99677, y: -336.1595}
-  m_SizeDelta: {x: 1039.9935, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2297459514377334420
 GameObject:
@@ -926,12 +926,12 @@ RectTransform:
   - {fileID: 1841027952454078579}
   - {fileID: 219753895951558772}
   m_Father: {fileID: 1807377057581014701}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 539.99677, y: -1189.7975}
-  m_SizeDelta: {x: 1039.9935, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3209259373449256283
 GameObject:
@@ -1366,6 +1366,44 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &3957399121762197769
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3078716367215207712}
+  m_Layer: 5
+  m_Name: TriggerToggle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3078716367215207712
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3957399121762197769}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6432986157014995700}
+  - {fileID: 6761279719533915178}
+  m_Father: {fileID: 1807377057581014701}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4155571248091558043
 GameObject:
   m_ObjectHideFlags: 0
@@ -1458,7 +1496,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6076343295303847440
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2077,10 +2115,10 @@ RectTransform:
   m_Father: {fileID: 1807377057581014701}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 539.99677, y: -125}
-  m_SizeDelta: {x: 1039.9935, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6495288338383876845
 GameObject:
@@ -2113,12 +2151,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1807377057581014701}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 539.99677, y: -1027.638}
-  m_SizeDelta: {x: 1039.9935, y: 2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6893796655577031242
 CanvasRenderer:
@@ -2189,12 +2227,12 @@ RectTransform:
   m_Children:
   - {fileID: 5387835898791890843}
   m_Father: {fileID: 1807377057581014701}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 539.99677, y: -1539.1166}
-  m_SizeDelta: {x: 1039.9935, y: 150}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5610681030318731455
 MonoBehaviour:
@@ -2255,10 +2293,10 @@ RectTransform:
   m_Father: {fileID: 1807377057581014701}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 539.99677, y: -498.31897}
-  m_SizeDelta: {x: 1039.9935, y: 2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7864220764371490122
 CanvasRenderer:
@@ -2411,10 +2449,10 @@ RectTransform:
   m_Father: {fileID: 6076343295303847440}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 150}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 540, y: -182.01}
+  m_SizeDelta: {x: 1080, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5554453117743034947
 CanvasRenderer:
@@ -2599,6 +2637,8 @@ MonoBehaviour:
   _toggleLoop: {fileID: 5447481923680934685}
   _btnIncreaseRange: {fileID: 5740265520945019918}
   _btnDecreaseRange: {fileID: 187219639351340815}
+  _toggleTrigger: {fileID: 1531517333836750659}
+  _objJumpToStep: {fileID: 4946163820521985069}
   _txtSliderRangeValue: {fileID: 1003014679005250591}
   _panelRange: {fileID: 1864338816220733172}
   _clampedScrollJumpToStep: {fileID: 2479150800511368539}
@@ -2751,10 +2791,10 @@ RectTransform:
   m_Father: {fileID: 5814333291791429207}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 519.99677, y: -75}
-  m_SizeDelta: {x: 1039.9935, y: 104.115}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 104.115}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7060197635307305377
 CanvasRenderer:
@@ -2884,12 +2924,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1807377057581014701}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 539.99677, y: -1351.957}
-  m_SizeDelta: {x: 1039.9935, y: 2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7988182178198110364
 CanvasRenderer:
@@ -3148,7 +3188,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1807377057581014701
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3164,6 +3204,7 @@ RectTransform:
   - {fileID: 591057647206023464}
   - {fileID: 3802461623017161759}
   - {fileID: 4972176754039224997}
+  - {fileID: 3078716367215207712}
   - {fileID: 8996872611347431922}
   - {fileID: 1488556158959479749}
   - {fileID: 2890221969784807990}
@@ -3367,6 +3408,141 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &344699877470173316
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3078716367215207712}
+    m_Modifications:
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 346.283
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 173.14151
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.00036621
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973617, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_text
+      value: Trigger step change
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973617, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_HorizontalAlignment
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6741343721877973631, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+        type: 3}
+      propertyPath: m_Name
+      value: TextLabel (TMP)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c0a396dae34c23145ba8eccfdf4a6ed2, type: 3}
+--- !u!224 &6432986157014995700 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6741343721877973616, guid: c0a396dae34c23145ba8eccfdf4a6ed2,
+    type: 3}
+  m_PrefabInstance: {fileID: 344699877470173316}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &615539353030837355
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5107,6 +5283,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: CancelBtn
       objectReference: {fileID: 0}
+    - target: {fileID: 5202719662002169242, guid: 610be676db076564e9f1b7757efd4b15,
+        type: 3}
+      propertyPath: m_text
+      value: Re-record
+      objectReference: {fileID: 0}
     - target: {fileID: 5202719662002169242, guid: 610be676db076564e9f1b7757efd4b15,
         type: 3}
       propertyPath: m_fontSize
@@ -5197,7 +5378,7 @@ PrefabInstance:
     - target: {fileID: 7651212056609272226, guid: 8f9f047aceb85df44af9064409a8647c,
         type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 7651212056609272226, guid: 8f9f047aceb85df44af9064409a8647c,
         type: 3}
@@ -6087,7 +6268,7 @@ PrefabInstance:
     - target: {fileID: 4183032759630723382, guid: ccb6b84aaecf6b6468e6f35bb7d90097,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4183032759630723382, guid: ccb6b84aaecf6b6468e6f35bb7d90097,
         type: 3}
@@ -6097,12 +6278,12 @@ PrefabInstance:
     - target: {fileID: 4183032759630723382, guid: ccb6b84aaecf6b6468e6f35bb7d90097,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4183032759630723382, guid: ccb6b84aaecf6b6468e6f35bb7d90097,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1080
       objectReference: {fileID: 0}
     - target: {fileID: 4183032759630723382, guid: ccb6b84aaecf6b6468e6f35bb7d90097,
         type: 3}
@@ -6147,12 +6328,12 @@ PrefabInstance:
     - target: {fileID: 4183032759630723382, guid: ccb6b84aaecf6b6468e6f35bb7d90097,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 540
       objectReference: {fileID: 0}
     - target: {fileID: 4183032759630723382, guid: ccb6b84aaecf6b6468e6f35bb7d90097,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -25.669998
       objectReference: {fileID: 0}
     - target: {fileID: 4183032759630723382, guid: ccb6b84aaecf6b6468e6f35bb7d90097,
         type: 3}
@@ -6326,7 +6507,7 @@ PrefabInstance:
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6336,7 +6517,7 @@ PrefabInstance:
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6346,12 +6527,12 @@ PrefabInstance:
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 1039.9935
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6396,12 +6577,12 @@ PrefabInstance:
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 539.99677
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -762.97845
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6508,6 +6689,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: PanelJumpToStep
       objectReference: {fileID: 0}
+    - target: {fileID: 3292675939213960065, guid: 306a3158d8129154789f82f75c313c69,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4391565595592084173, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_Color.a
@@ -6556,7 +6742,7 @@ PrefabInstance:
     - target: {fileID: 5329790150174247405, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: -99
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329790150174247405, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6712,6 +6898,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7a5b2805d8aaefc47abb7b1551e8b5a6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &4946163820521985069 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3292675939213960065, guid: 306a3158d8129154789f82f75c313c69,
+    type: 3}
+  m_PrefabInstance: {fileID: 7572137138155222956}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8996872611347431922 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
@@ -6912,3 +7104,140 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1001 &8767527269726330050
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3078716367215207712}
+    m_Modifications:
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 120
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 65
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -60
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7825399147096495240, guid: 2d5259a1589303e46990babb5e689f37,
+        type: 3}
+      propertyPath: m_Name
+      value: Toggle
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2d5259a1589303e46990babb5e689f37, type: 3}
+--- !u!114 &1531517333836750659 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7849080908092523393, guid: 2d5259a1589303e46990babb5e689f37,
+    type: 3}
+  m_PrefabInstance: {fileID: 8767527269726330050}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &6761279719533915178 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2627964235497976040, guid: 2d5259a1589303e46990babb5e689f37,
+    type: 3}
+  m_PrefabInstance: {fileID: 8767527269726330050}
+  m_PrefabAsset: {fileID: 0}
diff --git a/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/LabelEditor/LabelEditor_v2.prefab b/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/LabelEditor/LabelEditor_v2.prefab
index bc51f960e..5b87528f3 100644
--- a/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/LabelEditor/LabelEditor_v2.prefab
+++ b/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/LabelEditor/LabelEditor_v2.prefab
@@ -715,8 +715,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 340, y: -227.63487}
-  m_SizeDelta: {x: 680, y: 116.72994}
+  m_AnchoredPosition: {x: 340, y: -227.17874}
+  m_SizeDelta: {x: 680, y: 108.5475}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2758506640534599351
 MonoBehaviour:
@@ -1092,129 +1092,6 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: 0
   m_LayoutPriority: 1
---- !u!1 &3209259373449256283
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1099596480401865170}
-  - component: {fileID: 3086626389297481116}
-  - component: {fileID: 7736231228360898560}
-  - component: {fileID: 6908225137633135851}
-  m_Layer: 5
-  m_Name: ButtonArrow
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1099596480401865170
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3209259373449256283}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5842585802442485065}
-  - {fileID: 1659998271263486355}
-  m_Father: {fileID: 1724689342766649076}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 81.028114}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3086626389297481116
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3209259373449256283}
-  m_CullTransparentMesh: 1
---- !u!114 &7736231228360898560
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3209259373449256283}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &6908225137633135851
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3209259373449256283}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 7736231228360898560}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &3222094604269150317
 GameObject:
   m_ObjectHideFlags: 0
@@ -1607,7 +1484,7 @@ RectTransform:
   - {fileID: 837159229538277672}
   - {fileID: 3943426063185815944}
   m_Father: {fileID: 1724689342766649076}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1911,82 +1788,6 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
---- !u!1 &4155571248091558043
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1659998271263486355}
-  - component: {fileID: 1392239663437235777}
-  - component: {fileID: 2975290815984506664}
-  m_Layer: 5
-  m_Name: ImageArrowUp
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &1659998271263486355
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4155571248091558043}
-  m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.3, y: 1.3, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1099596480401865170}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.9724121, y: -5.834717}
-  m_SizeDelta: {x: -250.7293, y: -8.9764}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1392239663437235777
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4155571248091558043}
-  m_CullTransparentMesh: 1
---- !u!114 &2975290815984506664
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4155571248091558043}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 060493fed13c96344864b71217d06ed9, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4363100580381762010
 GameObject:
   m_ObjectHideFlags: 0
@@ -2422,82 +2223,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &4806939526560932457
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5842585802442485065}
-  - component: {fileID: 1403259765822761214}
-  - component: {fileID: 314227419684798603}
-  m_Layer: 5
-  m_Name: ImageArrowDown
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5842585802442485065
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4806939526560932457}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.3, y: 1.3, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1099596480401865170}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.0017089844, y: -5.208008}
-  m_SizeDelta: {x: -249.23, y: -8.0123}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1403259765822761214
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4806939526560932457}
-  m_CullTransparentMesh: 1
---- !u!114 &314227419684798603
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4806939526560932457}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 060493fed13c96344864b71217d06ed9, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5196119807214399024
 GameObject:
   m_ObjectHideFlags: 0
@@ -2663,7 +2388,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1099596480401865170}
   - {fileID: 1040319307361285255}
   m_Father: {fileID: 1807377057581014701}
   m_RootOrder: 0
@@ -3834,10 +3558,9 @@ MonoBehaviour:
   _fontColourButtonImage: {fileID: 6462154762143314804}
   _backgroundColourButtonImage: {fileID: 8465160593891922353}
   _fontSizeText: {fileID: 8358899015575783496}
-  _btnArrow: {fileID: 6908225137633135851}
   _panel: {fileID: 664765014074207512}
-  _arrowDown: {fileID: 4806939526560932457}
-  _arrowUp: {fileID: 4155571248091558043}
+  _arrowDown: {fileID: 0}
+  _arrowUp: {fileID: 0}
   _labelSettings: {fileID: 4711511322925271123, guid: d14279797b0dc6643905be1ebe9cef67,
     type: 3}
   _settingsPanelStart: 2
@@ -6502,7 +6225,7 @@ PrefabInstance:
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6512,7 +6235,7 @@ PrefabInstance:
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6522,7 +6245,7 @@ PrefabInstance:
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 190.78545
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6562,12 +6285,12 @@ PrefabInstance:
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 340
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -453.55905
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1571454330773894750, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6617,12 +6340,12 @@ PrefabInstance:
     - target: {fileID: 2397651440414370766, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2397651440414370766, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2397651440414370766, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6637,12 +6360,12 @@ PrefabInstance:
     - target: {fileID: 2397651440414370766, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 201.96925
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2397651440414370766, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -140.78545
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2816521647558756073, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6677,7 +6400,7 @@ PrefabInstance:
     - target: {fileID: 3292675939213960065, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4391565595592084173, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6692,7 +6415,7 @@ PrefabInstance:
     - target: {fileID: 5329226361495677399, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329226361495677399, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6702,7 +6425,7 @@ PrefabInstance:
     - target: {fileID: 5329226361495677399, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329226361495677399, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
@@ -6717,17 +6440,17 @@ PrefabInstance:
     - target: {fileID: 5329226361495677399, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 453.9385
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329226361495677399, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -140.78545
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329790150174247405, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: -99
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329790150174247405, guid: 306a3158d8129154789f82f75c313c69,
         type: 3}
diff --git a/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/LabelEditor/LabelSettings.cs b/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/LabelEditor/LabelSettings.cs
index a6e3a11ff..f76095dd2 100644
--- a/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/LabelEditor/LabelSettings.cs
+++ b/Assets/MirageXR/Tests/NewUI/Prefabs/Content/ContentEditors_v2/LabelEditor/LabelSettings.cs
@@ -136,7 +136,7 @@ private void OnColourPickerChange()
 
     private void OnFontSizeChanged(Component item)
     {
-        _fontSize = item.GetComponent<ObjectHolder<int>>().item - 1;
+        _fontSize = item.GetComponent<ObjectHolder<int>>().item;
         UpdateLabelPreview();
     }
 
diff --git a/Assets/MirageXR/Tests/NewUI/StepsListView_v2.cs b/Assets/MirageXR/Tests/NewUI/StepsListView_v2.cs
index 191a0182e..b8dd0e5a9 100644
--- a/Assets/MirageXR/Tests/NewUI/StepsListView_v2.cs
+++ b/Assets/MirageXR/Tests/NewUI/StepsListView_v2.cs
@@ -336,6 +336,8 @@ private void OnEditModeChanged(bool value)
         _isEditMode = value;
         _btnAddStep.transform.parent.gameObject.SetActive(value);
         _btnThumbnail.interactable = value;
+        _inputFieldActivityName.interactable = value;
+        _inputFieldActivityDescription.interactable = value;
 
         _stepsList.ForEach(t => t.OnEditModeChanged(value));
     }