diff --git a/apps/main/models.py b/apps/main/models.py
index afd71db..4b05b63 100644
--- a/apps/main/models.py
+++ b/apps/main/models.py
@@ -106,4 +106,7 @@ class Configuration(PolymorphicModel):
         return u'[%s - %s]: %s' % (self.experiment.campaign.name,
                                 self.experiment.name,
                                 self.device.name) 
+    def get_absolute_url(self):
+        from django.core.urlresolvers import reverse
+        return reverse('url_%s_conf' % self.device.device_type.name, args=[str(self.id)])
     
\ No newline at end of file
diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 4101a9a..52c0537 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -8,11 +8,11 @@
     <meta name="author" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     {# bootstrap_css #}
-    <link href="{% static 'css/bootstrap-flatly.min.css' %}" media="screen" rel="stylesheet">
+    <link href="{% static 'css/bootstrap-flatly.min.css' %}" media="all" rel="stylesheet">
     <style type="text/css">
       body {padding-top: 60px}
       .logo {padding-top: 5px; height: 50px}
-      .clickable-row {cursor: pointer;}   
+      .clickable-row {cursor: pointer;} 
     </style>
     <!--[if lt IE 9]>
 	<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -81,12 +81,21 @@
 	   <div class="page-header">
         <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1>
        <hr>
-       </div>  
-	   {% block content %}
-	   {% endblock %}
+       </div> 
+       {% block messages %}
+       {% if messages %}
+         {% for message in messages %}
+         <div class="alert alert-{% if message.tags %}{% if 'error' in message.tags %}danger{% else %}{{ message.tags }}{% endif %}{% else %}info{% endif %} alert-dismissible" role="alert">
+           <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+           <strong>{{message.tags|title}}!</strong> {{ message }}
+         </div>
+         {% endfor %}         
+       {% endif %}
+       {% endblock %}
 	   <br>
-	   {% block messages %}
+	   {% block content %}
 	   {% endblock %}
+	   <br>	   
 	   </div>
 	     
 	   
@@ -109,7 +118,7 @@
 {# bootstrap_javascript jquery=True #}
 <script src="{% static 'js/jquery.min.js' %}"></script>
 <script src="{% static 'js/bootstrap.min.js' %}"></script>
-
+<script src="{% static 'js/jquery-ui.min.js' %}"></script>
 {% block extra-js %}
 {% endblock%}
 </body>
diff --git a/apps/main/templates/confirm.html b/apps/main/templates/confirm.html
new file mode 100644
index 0000000..eb9da07
--- /dev/null
+++ b/apps/main/templates/confirm.html
@@ -0,0 +1,30 @@
+{% extends 'base.html' %}
+
+{% block content-title %}{{title}}{% endblock %}
+{% block content-suptitle %}{{suptitle}}{% endblock %}
+
+{% block content %}
+        
+<form action="" method="post" class="form">{% csrf_token %}
+{% if next %}
+  <input name="next" type="hidden" value="{{ next }}" />
+{% endif %}
+{% if delete_view %}
+  {% if object_name %}
+  <h3>Are you sure you wish to delete {{ object_name }}: {{ object }}?</h3>
+  {% else %}
+  <h3>Are you sure you wish to delete: {{ object }}?</h3>
+  {% endif %}
+{% else %}
+  <h4>Are you sure you wish to proceed?</h4>
+{% endif %}
+  {% if message %}<h4>{{ message }}</h4>{% endif %}
+  <br>
+  <button class="btn btn-primary" type="submit">
+    <span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Yes
+  </button>
+  <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">
+    <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> No
+  </button>
+</form>
+{% endblock %}
diff --git a/apps/main/templates/dev_conf_edit.html b/apps/main/templates/dev_conf_edit.html
index e076ccd..65f89eb 100644
--- a/apps/main/templates/dev_conf_edit.html
+++ b/apps/main/templates/dev_conf_edit.html
@@ -14,7 +14,10 @@
   {% bootstrap_form form layout='horizontal' size='medium' %}
   <div style="clear: both;"></div>
   <br>
-  <button type="submit" class="btn btn-primary pull-right">{{button}}</button>
+  <div class="pull-right">
+  <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
+  <button type="submit" class="btn btn-primary">{{button}}</button>
+  </div>
 </form>
 {% endblock %}
 
diff --git a/apps/rc/admin.py b/apps/rc/admin.py
index af1c194..00980e9 100644
--- a/apps/rc/admin.py
+++ b/apps/rc/admin.py
@@ -1,6 +1,8 @@
 from django.contrib import admin
-from .models import RCConfiguration
+from .models import RCConfiguration, RCLine, RCLineType
 
 # Register your models here.
 
 admin.site.register(RCConfiguration)
+admin.site.register(RCLine)
+admin.site.register(RCLineType)
diff --git a/apps/rc/forms.py b/apps/rc/forms.py
index 5e7c50f..f1cd99a 100644
--- a/apps/rc/forms.py
+++ b/apps/rc/forms.py
@@ -1,8 +1,43 @@
+import json
+
 from django import forms
-from .models import RCConfiguration
+from .models import RCConfiguration, RCLine, RCLineType
 
 class RCConfigurationForm(forms.ModelForm):
     
     class Meta:
         model = RCConfiguration
-        fields = ('experiment',)
+        exclude = ('clock', 'ipp', 'ntx', 'clock_divider')
+
+        
+class RCLineForm(forms.ModelForm):
+    
+    class Meta:
+        model = RCLine
+        fields = ('rc_configuration', 'line_type', 'channel')
+        widgets = {
+            'channel': forms.HiddenInput(),
+        }
+        
+    def save(self):        
+        line = super(RCLineForm, self).save()
+        #auto add channel
+        line.channel = RCLine.objects.filter(rc_configuration=line.rc_configuration).count()-1
+        #auto add position for TX, TR & CODE
+        if line.line_type.name in ('tx', 'tr', 'code'):
+            line.position = RCLine.objects.filter(rc_configuration=line.rc_configuration, line_type=line.line_type).count()-1
+        #add default params
+        params = {}
+        for field in json.loads(line.line_type.params):
+            params[field['name']] = field['value']
+        line.params = json.dumps(params)
+        line.save()
+        return
+    
+class RCLineViewForm(forms.Form):
+    
+    def __init__(self, *args, **kwargs):
+        extra_fields = kwargs.pop('extra_fields')
+        super(RCLineViewForm, self).__init__(*args, **kwargs)
+        for label, value in extra_fields.items():
+            self.fields[label] = forms.CharField(initial=value)
\ No newline at end of file
diff --git a/apps/rc/models.py b/apps/rc/models.py
index f5b44be..b3c8b08 100644
--- a/apps/rc/models.py
+++ b/apps/rc/models.py
@@ -1,10 +1,95 @@
+
+from polymorphic import PolymorphicModel
+
 from django.db import models
+from django.core.validators import MinValueValidator, MaxValueValidator
+
 from apps.main.models import Configuration
 # Create your models here.
 
+LINE_TYPES = (
+    ('tr', 'Transmission/reception selector signal'),
+    ('tx', 'A modulating signal (Transmission pulse)'),
+    ('codes', 'BPSK modulating signal'),
+    ('windows', 'Sample window signal'),
+    ('sync', 'Synchronizing signal'),
+    ('flip', 'IPP related periodic signal'),
+    ('prog_pulses', 'Programmable pulse'),
+    )
+
+LINE_PARAMS = {
+    "tr": [{"name":"time_after", "value": 0}],
+    "tx": [{"name": "pulse_width", "value": 0},{"name":"delays", "value":""}],
+    "codes": [{"name":"tx_ref", "value": ""},{"name":"code", "value": "", "choices":"RCLineCode"}],
+    "windows": [{"name":"tx_ref","value":""}, {"name":"first_height", "value":0}, {"name":"number_of_samples","value":0}, {"name":"resolution","value":0}, {"name":"last_height","value":0}],
+    "sync": [{"name": "delay", "value": 0}],
+    "flip": [{"name":"number_of_flips", "value": 0}],
+    "prog_pulses": [{"name": "begin", "value": 0}, {"name": "end","value": 0}],
+    }
+
+
 class RCConfiguration(Configuration):
-    
+        
+    clock = models.FloatField(verbose_name='Clock Master (MHz)', validators=[MinValueValidator(0), MaxValueValidator(80)], blank=True, null=True)
+    clock_divider = models.PositiveIntegerField(verbose_name='Clock divider', validators=[MinValueValidator(0), MaxValueValidator(256)], blank=True, null=True)
+    ipp = models.PositiveIntegerField(verbose_name='Inter pulse period (Km)', default=10)
+    ntx = models.PositiveIntegerField(verbose_name='Number of pulse of transmit', default=1)
+    time_before = models.PositiveIntegerField(verbose_name='Number of pulse of transmit', default=0)
 
     class Meta:
         db_table = 'rc_configurations'
-    
\ No newline at end of file
+
+    def get_number_position(self):
+        
+        lines = RCLine.objects.filter(rc_configuration=self.rc_configuration)
+        if lines:
+            return max([line.position for line in lines])
+
+class RCLineCode(models.Model):
+    
+    name = models.CharField(choices=LINE_TYPES, max_length=40)
+    bits_per_code = models.PositiveIntegerField(default=0)
+    number_of_codes = models.PositiveIntegerField(default=0)
+    codes = models.TextField(blank=True, null=True)
+    
+    class Meta:
+        db_table = 'rc_line_codes'
+        
+
+class RCLineType(models.Model):
+    
+    name = models.CharField(choices=LINE_TYPES, max_length=40)
+    description = models.TextField(blank=True, null=True)
+    params = models.TextField(default='[]')
+    
+    class Meta:
+        db_table = 'rc_line_types'
+
+    def __unicode__(self):
+        return u'%s - %s' % (self.name.upper(), self.get_name_display())
+    
+    
+class RCLine(models.Model):
+    
+    rc_configuration = models.ForeignKey(RCConfiguration)
+    line_type = models.ForeignKey(RCLineType)
+    channel = models.PositiveIntegerField(default=0)
+    position = models.PositiveIntegerField(default=0)
+    params = models.TextField(default='{}')
+        
+    class Meta:
+        db_table = 'rc_lines'
+    
+    def __unicode__(self):
+        return u'%s - %s' % (self.rc_configuration, self.get_name())
+    
+    def get_name(self):
+        
+        chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        
+        if self.line_type.name in ('tx', 'code', 'tr'):
+            return '%s%s' % (self.line_type.name.upper(), chars[self.position])
+        
+        return self.line_type.name.upper()
+
+
diff --git a/apps/rc/templates/index.html b/apps/rc/templates/index.html
deleted file mode 100644
index e21ab6b..0000000
--- a/apps/rc/templates/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "base.html" %}
-{% block mainactive %}active{% endblock %}
-
-{% block content-title %}TITLE{% endblock %}
-{% block content-suptitle %}Suptitle{% endblock %}
-
-{% block content %}
-  <p class="text-justify">
-  {% lorem %}
-  </p>
-{% endblock %}
-
-{% block sidebar%}
-
-{% endblock %}
diff --git a/apps/rc/templates/rc_add_line.html b/apps/rc/templates/rc_add_line.html
new file mode 100644
index 0000000..029ea49
--- /dev/null
+++ b/apps/rc/templates/rc_add_line.html
@@ -0,0 +1 @@
+{% extends "dev_conf_edit.html" %}
\ No newline at end of file
diff --git a/apps/rc/templates/rc_conf.html b/apps/rc/templates/rc_conf.html
new file mode 100644
index 0000000..fe58ef6
--- /dev/null
+++ b/apps/rc/templates/rc_conf.html
@@ -0,0 +1,82 @@
+{% extends "dev_conf.html" %}
+{% load static %}
+{% load bootstrap3 %}
+{% block extra-head %}
+<style type="text/css">
+    /* show the move cursor as the user moves the mouse over the panel header.*/
+    .panel-default { cursor: move; }
+</style>
+{% endblock %}
+{% block content %}
+<table class="table table-bordered">
+{% for key in dev_conf_keys %}
+<tr><th>{{key|title}}</th><td>{{dev_conf|attr:key}}</td></tr>
+{% endfor %}
+</table>
+<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_send">Send</button>
+<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_export">Export</button>
+<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit">Edit</button>
+<br>
+<h2>RC Lines</h2><hr>
+
+<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+{% for line in rc_lines %}
+  <div class="panel panel-default" >
+    <div class="panel-heading" role="tab" id="headingOne">
+      <h4 class="panel-title">
+        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{{line.id}}" aria-expanded="true" aria-controls="collapseOne">
+          CH{{line.channel}} - {{line.get_name}}
+        </a>
+      <button class="btn-xs btn-danger pull-right" name="bt_remove_line" value="{{line.pk}}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
+      <button class="btn-xs btn-info pull-right" name="bt_line_down" value="{{line.pk}}"><span class="glyphicon glyphicon-arrow-down" aria-hidden="true"></span></button>
+      <button class="btn-xs btn-info pull-right" name="bt_line_up" value="{{line.pk}}"><span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span></button>      
+      </h4>      
+    </div>
+    <div id="collapse{{line.id}}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+      <div class="panel-body">
+        {% bootstrap_form line.form layout='horizontal' size='small' %}        
+      </div>
+    </div>
+  </div>
+{% endfor%}
+</div>
+<br>
+<div class="pull-right">
+<button class="btn btn-primary" id="bt_add_line">Add Line</button>
+<button class="btn btn-primary" id="bt_add_line">  Edit  </button>
+<button class="btn btn-primary" id="bt_pulses">Pulses</button>
+</div>
+{% endblock %}
+
+
+{% block extra-js%}
+
+<script type="text/javascript">
+    $(document).ready(function() {
+  $("#bt_edit").click(function() {
+    document.location = "{% url 'url_edit_rc_conf' dev_conf.id%}";
+  });
+  
+  $("#bt_add_line").click(function() {
+    document.location = "{% url 'url_add_rc_line' dev_conf.id%}";
+  });
+  
+  $("button[name=bt_remove_line]").click(function(){
+    document.location = "line/"+$(this).val()+"/delete/";
+  });  
+  
+  $("button[name=bt_line_up]").click(function(){
+    document.location = "line/"+$(this).val()+"/up/";
+  });  
+  
+  $("button[name=bt_line_down]").click(function(){
+    document.location = "line/"+$(this).val()+"/down/";
+  });  
+  
+
+  
+    $(".panel-group").sortable();
+  
+  }); 
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/apps/rc/templates/rc_conf_edit.html b/apps/rc/templates/rc_conf_edit.html
new file mode 100644
index 0000000..029ea49
--- /dev/null
+++ b/apps/rc/templates/rc_conf_edit.html
@@ -0,0 +1 @@
+{% extends "dev_conf_edit.html" %}
\ No newline at end of file
diff --git a/apps/rc/urls.py b/apps/rc/urls.py
index 4a13090..6990dad 100644
--- a/apps/rc/urls.py
+++ b/apps/rc/urls.py
@@ -1,6 +1,10 @@
 from django.conf.urls import url
 
 urlpatterns = (
-    url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_rc_conf'),
-    url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_rc_conf'),
+    url(r'^(?P<id>-?\d+)/$', 'apps.rc.views.conf', name='url_rc_conf'),
+    url(r'^(?P<id>-?\d+)/edit/$', 'apps.rc.views.conf_edit', name='url_edit_rc_conf'),
+    url(r'^(?P<id>-?\d+)/add_line/$', 'apps.rc.views.add_line', name='url_add_rc_line'),
+    url(r'^(?P<conf_id>-?\d+)/line/(?P<line_id>-?\d+)/delete/$', 'apps.rc.views.remove_line', name='url_remove_rc_line'),
+    url(r'^(?P<conf_id>-?\d+)/line/(?P<line_id>-?\d+)/up/$', 'apps.rc.views.line_up', name='url_rc_line_up'),
+    url(r'^(?P<conf_id>-?\d+)/line/(?P<line_id>-?\d+)/down/$', 'apps.rc.views.line_down', name='url_rc_line_down'),
 )
diff --git a/apps/rc/views.py b/apps/rc/views.py
index 91ea44a..af5333a 100644
--- a/apps/rc/views.py
+++ b/apps/rc/views.py
@@ -1,3 +1,154 @@
-from django.shortcuts import render
+import json
+
+from django.contrib import messages
+from django.shortcuts import render, redirect, get_object_or_404
+
+from apps.main.models import Configuration, Experiment
+
+from .models import RCConfiguration, RCLine
+from .forms import RCConfigurationForm, RCLineForm, RCLineViewForm
+
+
+def conf(request, id):
+
+    conf = get_object_or_404(RCConfiguration, pk=id)
+    
+    lines = RCLine.objects.filter(rc_configuration=conf).order_by('channel')
+    
+    for line in lines:
+        line.form = RCLineViewForm(extra_fields=json.loads(line.params))
+    
+    kwargs = {}
+    kwargs['dev_conf'] = conf
+    kwargs['rc_lines'] = lines
+    kwargs['dev_conf_keys'] = ['clock', 'ipp', 'ntx','clock_divider']
+    
+    kwargs['title'] = 'RC Configuration'
+    kwargs['suptitle'] = 'Details'
+    
+    kwargs['button'] = 'Edit Configuration'
+    
+    ###### SIDEBAR ######
+    experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
+    configurations = Configuration.objects.filter(experiment=conf.experiment)
+    
+    exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
+    conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
+    
+    kwargs['experiment_keys'] = exp_keys[1:]
+    kwargs['experiments'] = experiments.values(*exp_keys)
+    
+    kwargs['configuration_keys'] = conf_keys[1:]
+    kwargs['configurations'] = configurations.values(*conf_keys)
+    
+    return render(request, 'rc_conf.html', kwargs)
+
+    
+def conf_edit(request, id):
+    
+    conf = get_object_or_404(RCConfiguration, pk=id)
+    
+    if request.method=='GET':
+        form = RCConfigurationForm(instance=conf)
+        
+    if request.method=='POST':
+        form = RCConfigurationForm(request.POST, instance=conf)
+        
+        if form.is_valid():
+            form.save()
+            return redirect('url_rc_conf', id=id)
+          
+    kwargs = {}
+    kwargs['form'] = form
+    kwargs['title'] = 'Device Configuration'
+    kwargs['suptitle'] = 'Edit'    
+    kwargs['button'] = 'Update'
+    kwargs['previous'] = conf.get_absolute_url()
+    return render(request, 'rc_conf_edit.html', kwargs)
+
+
+def add_line(request, id):
+    
+    conf = get_object_or_404(RCConfiguration, pk=id)
+    
+    if request.method=='GET':
+        form = RCLineForm(initial={'rc_configuration':conf.id})
+        
+    if request.method=='POST':
+        form = RCLineForm(request.POST)
+        
+        if form.is_valid():
+            form.save()
+            return redirect('url_rc_conf', id=id)
+          
+    kwargs = {}
+    kwargs['form'] = form
+    kwargs['title'] = 'RC Configuration'
+    kwargs['suptitle'] = 'Add Line'
+    kwargs['button'] = 'Add'
+    kwargs['previous'] = conf.get_absolute_url()
+    return render(request, 'rc_add_line.html', kwargs)
+
+
+def remove_line(request, conf_id, line_id):
+    
+    conf = get_object_or_404(RCConfiguration, pk=conf_id)
+    line = get_object_or_404(RCLine, pk=line_id)
+    
+    if request.method == 'POST':
+        if line:
+            try:
+                channel = line.channel
+                line.delete()
+                for ch in range(channel+1, RCLine.objects.filter(rc_configuration=conf).count()+1):
+                    l = RCLine.objects.get(rc_configuration=conf, channel=ch)
+                    l.channel = l.channel-1
+                    l.save()
+                messages.success(request, 'Line: "%s" has been deleted.'  % line)
+            except:
+                messages.error(request, 'Unable to delete line: "%s".' % line) 
+
+        return redirect(conf.get_absolute_url())
+            
+    kwargs = {}
+    
+    kwargs['object'] = line
+    kwargs['delete_view'] = True
+    kwargs['title'] = 'Confirm delete'
+    kwargs['previous'] = conf.get_absolute_url()
+    return render(request, 'confirm.html', kwargs)
+
+
+def line_up(request, conf_id, line_id):
+    
+    conf = get_object_or_404(RCConfiguration, pk=conf_id)
+    line = get_object_or_404(RCLine, pk=line_id)
+    
+    if line:
+        ch = line.channel
+        if ch-1>=0:
+            line0 = RCLine.objects.get(rc_configuration=conf, channel=ch-1)
+            line0.channel = ch
+            line0.save()
+            line.channel = ch-1 
+            line.save()            
+    
+    return redirect(conf.get_absolute_url())
+
+
+def line_down(request, conf_id, line_id):
+    
+    conf = get_object_or_404(RCConfiguration, pk=conf_id)
+    line = get_object_or_404(RCLine, pk=line_id)
+        
+    if line:
+        ch = line.channel
+        if ch+1<RCLine.objects.filter(rc_configuration=conf).count():
+            line1 = RCLine.objects.get(rc_configuration=conf, channel=ch+1)
+            line1.channel = ch
+            line1.save()
+            line.channel = ch+1 
+            line.save()
+                    
+    return redirect(conf.get_absolute_url())
 
-# Create your views here.