diff --git a/apps/cgs/forms.py b/apps/cgs/forms.py
index 95382fe..462942f 100644
--- a/apps/cgs/forms.py
+++ b/apps/cgs/forms.py
@@ -18,4 +18,5 @@ class CGSConfigurationForm(forms.ModelForm):
     class Meta:
         model = CGSConfiguration
         #exclude = ('freqs', 'clk_in', 'mult','div',)
-        exclude = ('freqs',)
+#         exclude = ('freqs',)
+        fields = ('freq0', 'freq1', 'freq2', 'freq3')
diff --git a/apps/cgs/templates/conf_cgs.html b/apps/cgs/templates/conf_cgs.html
new file mode 100644
index 0000000..a89fbe3
--- /dev/null
+++ b/apps/cgs/templates/conf_cgs.html
@@ -0,0 +1 @@
+{% extends "conf_device.html" %}
\ No newline at end of file
diff --git a/apps/cgs/views.py b/apps/cgs/views.py
index baee485..fd94c46 100644
--- a/apps/cgs/views.py
+++ b/apps/cgs/views.py
@@ -9,20 +9,30 @@ from apps.main.models import Device
 def configurate_frequencies(request, id=0):
     kwargs = {}
     if id:
+        
+        conf = CGSConfiguration.objects.get(pk=id)
+        experiment = conf.experiment
+        
         conf = CGSConfiguration.objects.get(pk=id)
         devices = Device.objects.filter(configuration__experiment=conf.experiment)
         devices = devices.values('configuration__id', 'device_type__alias', 'device_type__name')
         for device in devices:
             if device['device_type__alias']=='cgs':
                 device['active'] = 'active'
+                break
+        
+        device = device
         form = CGSConfigurationForm(instance=conf)
     else:
         form = CGSConfigurationForm()
 
     data = {
         'form': form,
+        'device': device,
         'devices':devices,
         'title': ('YAP'),
+        'experiment': experiment,
+        
     }
     
     if request.method == 'POST':
@@ -40,7 +50,7 @@ def configurate_frequencies(request, id=0):
         form = CGSConfigurationForm()           
     
 
-    return render_to_response('index_cgs.html', data, context_instance=RequestContext(request))
+    return render_to_response('conf_cgs.html', data, context_instance=RequestContext(request))
     #return render_to_response("index.html", kwargs, context_instance=RequestContext(request))
     #return_to_response('index.html', {'title': 'Configura','form': form}, context_instance=RequestContext(request))