diff --git a/apps/cgs/migrations/__init__.py b/apps/cgs/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/apps/cgs/migrations/__init__.py
+++ /dev/null
diff --git a/apps/dds/templates/dds_conf.html b/apps/dds/templates/dds_conf.html
index 982ca82..c2c0c61 100644
--- a/apps/dds/templates/dds_conf.html
+++ b/apps/dds/templates/dds_conf.html
@@ -3,7 +3,7 @@
 {% block extra-js%}
 <script type="text/javascript">
   
-  $("#bt_edit_device").click(function() {
+  $("#bt_edit").click(function() {
     document.location = "{% url 'url_edit_dds_conf' dev_conf.id%}";
   });
   
diff --git a/apps/main/models.py b/apps/main/models.py
index ba9e6d5..6f9e285 100644
--- a/apps/main/models.py
+++ b/apps/main/models.py
@@ -2,9 +2,16 @@ from itertools import chain
 from django.db import models
 from polymorphic import PolymorphicModel
 
-STATES = (
-          (0, 'Inactive'),
-          (1, 'Active'),
+CONF_STATES = (
+          (0, 'Active'),
+          (1, 'Historial'),
+         )
+
+DEV_STATES = (
+          (0, 'No connected'),
+          (1, 'Connected'),
+          (2, 'Configured'),
+          (3, 'Running'),
          )
 
 DEV_TYPES = (
@@ -41,10 +48,11 @@ class Device(models.Model):
     ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0')
     port_address = models.PositiveSmallIntegerField(default=2000)
     description = models.TextField(blank=True, null=True)
+    status = models.PositiveSmallIntegerField(default=0, choices=DEV_STATES)
     
 #     serial_number = models.CharField(max_length=40, default='')
 #     mac_address = models.CharField(max_length = 20, null=True, blank=True)
-#     status = models.PositiveSmallIntegerField(default=1, choices=STATES)
+    
 
     class Meta:
         db_table = 'db_devices'
@@ -84,9 +92,10 @@ class Configuration(PolymorphicModel):
 
     experiment = models.ForeignKey(Experiment)
     device = models.ForeignKey(Device)
+    status = models.PositiveSmallIntegerField(default=0, choices=CONF_STATES)
+    date = models.DateTimeField(auto_now=True, blank=True)
+    
 #     parameters = models.TextField(default='{}')
-#     status = models.PositiveSmallIntegerField(default=1, choices=STATES)
-
     class Meta:
         db_table = 'db_configurations'