diff --git a/NEW/src/Utils/JdeScoping.ConfigManager/Views/MainWindow.axaml b/NEW/src/Utils/JdeScoping.ConfigManager/Views/MainWindow.axaml
index 7a908e1..31bb227 100644
--- a/NEW/src/Utils/JdeScoping.ConfigManager/Views/MainWindow.axaml
+++ b/NEW/src/Utils/JdeScoping.ConfigManager/Views/MainWindow.axaml
@@ -58,6 +58,9 @@
         <DataTemplate DataType="{x:Type steps:JdeDateTransformerViewModel}">
             <editors:JdeDateEditorView/>
         </DataTemplate>
+        <DataTemplate DataType="{x:Type steps:RegexTransformerViewModel}">
+            <editors:RegexEditorView/>
+        </DataTemplate>
         <DataTemplate DataType="{x:Type steps:PreScriptStepViewModel}">
             <editors:ScriptEditorView/>
         </DataTemplate>
@@ -66,11 +69,8 @@
         </DataTemplate>
 
         <!-- SecureStore ViewModels -->
-        <DataTemplate DataType="{x:Type forms:SecureStoreLockedFormViewModel}">
-            <views:SecureStoreLockedFormView/>
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type forms:SecureStoreUnlockedFormViewModel}">
-            <views:SecureStoreUnlockedFormView/>
+        <DataTemplate DataType="{x:Type forms:SecureStoreInfoFormViewModel}">
+            <views:SecureStoreInfoFormView/>
         </DataTemplate>
         <DataTemplate DataType="{x:Type forms:SecretFormViewModel}">
             <views:SecretFormView/>
@@ -126,11 +126,6 @@
                         <TextBlock Text="S" FontSize="12" FontWeight="Bold"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Header="_Lock All Stores" Command="{Binding LockAllStoresCommand}">
-                    <MenuItem.Icon>
-                        <TextBlock Text="L" FontSize="12" FontWeight="Bold"/>
-                    </MenuItem.Icon>
-                </MenuItem>
                 <Separator/>
                 <MenuItem Header="_Generate Key File..." Command="{Binding GenerateKeyFileCommand}">
                     <MenuItem.Icon>
@@ -160,7 +155,6 @@
                 <Border Width="1" Height="20" Background="#2D3540" Margin="4,0"/>
                 <Button Content="+ Pipeline" Command="{Binding AddPipelineCommand}" ToolTip.Tip="Add Pipeline" Classes="toolbar"/>
                 <Border Width="1" Height="20" Background="#2D3540" Margin="4,0"/>
-                <Button Content="Unlock" Command="{Binding UnlockStoreCommand}" ToolTip.Tip="Unlock/Lock Store" Classes="toolbar"/>
                 <Button Content="+ Secret" Command="{Binding AddSecretCommand}" ToolTip.Tip="Add Secret" Classes="toolbar"/>
             </StackPanel>
         </Border>
@@ -216,9 +210,6 @@
                                 <MenuItem Header="New Pipeline..." Command="{Binding AddPipelineCommand}"/>
                                 <MenuItem Header="Delete Pipeline" Command="{Binding DeletePipelineCommand}"/>
                                 <Separator/>
-                                <MenuItem Header="Unlock Store..." Command="{Binding UnlockStoreCommand}"/>
-                                <MenuItem Header="Lock Store" Command="{Binding LockStoreCommand}"/>
-                                <Separator/>
                                 <MenuItem Header="Add Secret..." Command="{Binding AddSecretCommand}"/>
                                 <MenuItem Header="Delete Secret" Command="{Binding DeleteSecretCommand}"/>
                                 <Separator/>