diff --git a/src/Components/Editor/PropertiesOperations.ts b/src/Components/Editor/PropertiesOperations.ts
index 11c1b62..bdcc03d 100644
--- a/src/Components/Editor/PropertiesOperations.ts
+++ b/src/Components/Editor/PropertiesOperations.ts
@@ -4,7 +4,7 @@ import { IHistoryState } from '../../Interfaces/IHistoryState';
 import IProperties from '../../Interfaces/IProperties';
 import { findContainerById } from '../../utils/itertools';
 import { getCurrentHistory } from './Editor';
-import { RecalculatePhysics } from './RigidBodyBehaviors';
+import { INPUT_TYPES } from '../Properties/PropertiesInputTypes';
 
 /**
   * Handled the property change event in the properties form
@@ -28,20 +28,6 @@ export function OnPropertyChange(
     throw new Error('[OnPropertyChange] Property was changed before selecting a Container');
   }
 
-  if (parent === null) {
-    const selectedContainerClone: IContainerModel = structuredClone(current.SelectedContainer);
-    (selectedContainerClone.properties as any)[key] = value;
-    setHistory(history.concat([{
-      LastAction: 'Change property of main',
-      MainContainer: selectedContainerClone,
-      SelectedContainer: selectedContainerClone,
-      SelectedContainerId: selectedContainerClone.properties.id,
-      TypeCounters: Object.assign({}, current.TypeCounters)
-    }]));
-    setHistoryCurrentStep(history.length);
-    return;
-  }
-
   const mainContainerClone: IContainerModel = structuredClone(current.MainContainer);
   const container: ContainerModel | undefined = findContainerById(mainContainerClone, current.SelectedContainer.properties.id);
 
@@ -49,7 +35,11 @@ export function OnPropertyChange(
     throw new Error('[OnPropertyChange] Container model was not found among children of the main container!');
   }
 
-  (container.properties as any)[key] = value;
+  if (INPUT_TYPES[key] === 'number') {
+    (container.properties as any)[key] = Number(value);
+  } else {
+    (container.properties as any)[key] = value;
+  }
 
   if (container.properties.isRigidBody) {
     RecalculatePhysics(container);
@@ -88,25 +78,6 @@ export function OnPropertiesSubmit(
     throw new Error('[OnPropertyChange] Property was changed before selecting a Container');
   }
 
-  if (parent === null) {
-    const selectedContainerClone: IContainerModel = structuredClone(current.SelectedContainer);
-    for (const property in properties) {
-      const input = (event.target as HTMLFormElement).querySelector(`#${property}`);
-      if (input instanceof HTMLInputElement) {
-        (selectedContainerClone.properties as any)[property] = input.value;
-      }
-    }
-    setHistory(history.concat([{
-      LastAction: 'Change property of main',
-      MainContainer: selectedContainerClone,
-      SelectedContainer: selectedContainerClone,
-      SelectedContainerId: selectedContainerClone.properties.id,
-      TypeCounters: Object.assign({}, current.TypeCounters)
-    }]));
-    setHistoryCurrentStep(history.length);
-    return;
-  }
-
   const mainContainerClone: IContainerModel = structuredClone(current.MainContainer);
   const container: ContainerModel | undefined = findContainerById(mainContainerClone, current.SelectedContainer.properties.id);
 
@@ -118,6 +89,11 @@ export function OnPropertiesSubmit(
     const input = (event.target as HTMLFormElement).querySelector(`#${property}`);
     if (input instanceof HTMLInputElement) {
       (container.properties as any)[property] = input.value;
+      if (INPUT_TYPES[property] === 'number') {
+        (container.properties as any)[property] = Number(input.value);
+      } else {
+        (container.properties as any)[property] = input.value;
+      }
     }
   }