diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 57f82f4e..dad84e29 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Config/Config/AlarmsConfig.xml b/Step.Config/Config/AlarmsConfig.xml
index 9b110d04..454d2102 100644
--- a/Step.Config/Config/AlarmsConfig.xml
+++ b/Step.Config/Config/AlarmsConfig.xml
@@ -3,7 +3,7 @@
 	<alarm>
 	   <alarmId>1</alarmId>
 	   <plcId>1</plcId>
-	   <restoreIsActive>false</restoreIsActive>
+	   <restoreIsActive>true</restoreIsActive>
 	</alarm>
 	<alarm>
 	   <alarmId>2</alarmId>
diff --git a/Step.Config/Config/serverConfig.xml b/Step.Config/Config/serverConfig.xml
index 66484c93..dbc8112d 100644
--- a/Step.Config/Config/serverConfig.xml
+++ b/Step.Config/Config/serverConfig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <serverConfig>
   <ncConfig>
-    <ncVendor>SIEMENS</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
+    <ncVendor>DEMO</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
     <showNcHMI>true</showNcHMI>
     <ncIpAddress>localhost</ncIpAddress>
     <ncPort>8080</ncPort>
diff --git a/Step.Database/Migrations/Configuration.cs b/Step.Database/Migrations/Configuration.cs
index 2ce0f55d..ad8d7737 100644
--- a/Step.Database/Migrations/Configuration.cs
+++ b/Step.Database/Migrations/Configuration.cs
@@ -23,7 +23,7 @@ namespace Step.Database.Migrations
                 new RoleModel() { RoleId = (int)ROLE_IDS.ADMIN, Level = 10, Name = "Admin" },
                 new RoleModel() { RoleId = (int)ROLE_IDS.GUEST, Level = 1, Name = "Guest" }
                     );
-
+             
             context.FunctionsAccess.AddOrUpdate(
                // General Function
                new FunctionAccessModel() { Name = GENERAL, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 100, ReadLevelMin = 1, PlcId = 0 },
@@ -37,7 +37,7 @@ namespace Step.Database.Migrations
                new FunctionAccessModel() { Name = NC_SOFTKEY, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 4 },
                new FunctionAccessModel() { Name = USER_SOFTKEY, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 5 },
                new FunctionAccessModel() { Name = HEADS_CMD, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 6 },
-               new FunctionAccessModel() { Name = AXES_CMD, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 7 },
+               new FunctionAccessModel() { Name = AXES_SELECTION, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 7 },
 
                new FunctionAccessModel() { Name = TOOL_MANAGER, Area = TOOLING_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 8 },
                new FunctionAccessModel() { Name = MAINTENANCE, Area = MAINTENANCE_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 9 }
diff --git a/Step.Model/Constants.cs b/Step.Model/Constants.cs
index bc26fccb..6618b78e 100644
--- a/Step.Model/Constants.cs
+++ b/Step.Model/Constants.cs
@@ -210,6 +210,7 @@ namespace Step.Model
             public const string AXES_CMD = "axesCmd";
             public const string TOOL_MANAGER = "toolManager";
             public const string MAINTENANCE = "maintenance";
+            public const string AXES_SELECTION = "axesSoftkeys";
         }
 
         public static class API_ERROR_KEYS
diff --git a/Step.Model/DTOModels/DTOAxisNameModel.cs b/Step.Model/DTOModels/DTOAxisNameModel.cs
index 3e896fc6..6c4b560a 100644
--- a/Step.Model/DTOModels/DTOAxisNameModel.cs
+++ b/Step.Model/DTOModels/DTOAxisNameModel.cs
@@ -7,7 +7,7 @@ namespace Step.Model.DTOModels
         public override bool Equals(object obj)
         {
             var item = obj as DTOAxisNameModel;
-
+             
             // Object is not a DTOAxisNameModel instance
             if (item == null)
                 return false;
@@ -18,6 +18,9 @@ namespace Step.Model.DTOModels
             if (item.Name != Name)
                 return false;
 
+            if (item.IsSelectable != IsSelectable)
+                return false;
+
             return true;
         }
 
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index 4207d494..e3b3c19d 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -1342,7 +1342,8 @@ namespace Step.NC
                 axesNames = plcAxes.Select(x => new DTOAxisNameModel()
                 {
                     Id = x.Id,
-                    Name = x.Name
+                    Name = x.Name,
+                    IsSelectable = x.IsSelectable                    
                 }).ToList();
             }
 
diff --git a/Step/wwwroot/src/@types/signalr.process.d.ts b/Step/wwwroot/src/@types/signalr.process.d.ts
index 9165f682..8daa3c88 100644
--- a/Step/wwwroot/src/@types/signalr.process.d.ts
+++ b/Step/wwwroot/src/@types/signalr.process.d.ts
@@ -19,7 +19,7 @@ declare module signalr_process {
   interface AxisData{
     id:number;
     name: string;
-
+    isSelectable: string;
   }
 
   interface AxisValueData{
diff --git a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
index 27262c83..0211f905 100644
--- a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
@@ -14,7 +14,7 @@
     <div class="axes-menu-container" v-if="showAxesMenu">
       <div class="menu">
         <button @click="setAxes(a.id)"
-                v-for="a in axes"
+                v-for="a in axes" v-if="a.isSelectable"
                 :key="a.id"
                 :class="{active: a.id == selectedAxisId}">{{a.name}}</button>
       </div>