diff --git a/MainWindow.xaml b/MainWindow.xaml
index 741bdb1..9ee9d29 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -7,6 +7,7 @@
         xmlns:local="clr-namespace:CtrEditor"
         xmlns:uc="clr-namespace:CtrEditor.ObjetosSim.UserControls"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"   
         xmlns:ObjetosSim="clr-namespace:CtrEditor.ObjetosSim" x:Class="CtrEditor.MainWindow"
         Height="900" Width="1600" WindowState="Maximized"
         ResizeMode="CanResize" Title="{Binding directorioTrabajo}" Icon="/app2.png">
@@ -164,11 +165,25 @@
                   VerticalAlignment="Center"/>
 
                 <!-- PanelEdicion -->
-                <xctk:PropertyGrid Grid.Row="2" Margin="5" Name="PanelEdicion"  AutoGenerateProperties="False">
+                <xctk:PropertyGrid Grid.Row="2" Margin="5" x:Name="PanelEdicion" AutoGenerateProperties="False" SelectedObject="{Binding}">
+
+                    <xctk:PropertyGrid.EditorDefinitions>
+                        <xctk:EditorTemplateDefinition>
+                            <xctk:EditorTemplateDefinition.TargetProperties>
+                                <xctk:TargetPropertyType Type="{x:Type sys:Single}" />
+                            </xctk:EditorTemplateDefinition.TargetProperties>
+                            <xctk:EditorTemplateDefinition.EditingTemplate>
+                                <DataTemplate>
+                                    <TextBox Text="{Binding Value, Converter={StaticResource floatFormatter}}"/>
+                                </DataTemplate>
+                            </xctk:EditorTemplateDefinition.EditingTemplate>
+                        </xctk:EditorTemplateDefinition>
+                    </xctk:PropertyGrid.EditorDefinitions>
+
                 </xctk:PropertyGrid>
 
 
-                    <ToolBarTray Grid.Row="3">
+                <ToolBarTray Grid.Row="3">
                     <ToolBar>
                         <Button Command="{Binding TBEliminarUserControlCommand}" ToolTip="Eliminar Control">
                             <StackPanel>
diff --git a/ObjetosSim/UserControlFactory.cs b/ObjetosSim/UserControlFactory.cs
index db1021b..697da15 100644
--- a/ObjetosSim/UserControlFactory.cs
+++ b/ObjetosSim/UserControlFactory.cs
@@ -94,6 +94,37 @@ namespace CtrEditor.ObjetosSim
                                             .Cast<PropertyDescriptor>()
                                             .Where(prop => !prop.Attributes.OfType<HiddenAttribute>().Any());
 
+
+            //// Create the DataTemplate for float and double editors
+            //var doubleFactory = new FrameworkElementFactory(typeof(DoubleUpDown));
+            //doubleFactory.SetValue(DoubleUpDown.FormatStringProperty, "F3");
+            //doubleFactory.SetValue(DoubleUpDown.IncrementProperty, 0.001);
+            //doubleFactory.SetValue(DoubleUpDown.MaximumProperty, 200000.599);
+            //doubleFactory.SetBinding(DoubleUpDown.ValueProperty, new Binding("Value")
+            //{
+            //    Mode = BindingMode.TwoWay,
+            //    UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
+            //});
+
+            //var doubleTemplate = new DataTemplate { VisualTree = doubleFactory };
+
+            //// Add editor definitions for float and double
+            //var floatEditorDefinition = new EditorDefinition
+            //{
+            //    EditorTemplate = doubleTemplate,
+            //    TargetType = typeof(float)
+            //};
+
+            //var doubleEditorDefinition = new EditorDefinition
+            //{
+            //    EditorTemplate = doubleTemplate,
+            //    TargetType = typeof(double)
+            //};
+
+            //propertyGrid.EditorDefinitions.Add(floatEditorDefinition);
+            //propertyGrid.EditorDefinitions.Add(doubleEditorDefinition);
+
+
             foreach (var property in properties)
             {
                 var displayNameAttr = property.Attributes.OfType<DisplayNameAttribute>().FirstOrDefault();
@@ -117,35 +148,6 @@ namespace CtrEditor.ObjetosSim
                 }
             }
 
-            // Create the DataTemplate for float and double editors
-            var doubleFactory = new FrameworkElementFactory(typeof(DoubleUpDown));
-            doubleFactory.SetValue(DoubleUpDown.FormatStringProperty, "F3");
-            doubleFactory.SetValue(DoubleUpDown.IncrementProperty, 0.001);
-            doubleFactory.SetValue(DoubleUpDown.MaximumProperty, 200000.599);
-            doubleFactory.SetBinding(DoubleUpDown.ValueProperty, new Binding("Value")
-            {
-                Mode = BindingMode.TwoWay,
-                UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
-            });
-
-            var doubleTemplate = new DataTemplate { VisualTree = doubleFactory };
-
-            // Add editor definitions for float and double
-            var floatEditorDefinition = new EditorDefinition
-            {
-                EditorTemplate = doubleTemplate,
-                TargetType = typeof(float)
-            };
-
-            var doubleEditorDefinition = new EditorDefinition
-            {
-                EditorTemplate = doubleTemplate,
-                TargetType = typeof(double)
-            };
-
-            propertyGrid.EditorDefinitions.Add(floatEditorDefinition);
-            propertyGrid.EditorDefinitions.Add(doubleEditorDefinition);
-
             propertyGrid.SelectedObject = selectedObject;
         }