diff --git a/apps/main/templates/base_edit.html b/apps/main/templates/base_edit.html
index ee4ed38..e4996b4 100644
--- a/apps/main/templates/base_edit.html
+++ b/apps/main/templates/base_edit.html
@@ -23,7 +23,7 @@
   {% endif %}
   {% if 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="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">{% if cancel %}{{cancel}}{% else %}Cancel{% endif %}</button>
   <button type="submit" class="btn btn-primary">{{button}}</button>
   </div>
   {% endif %}
diff --git a/apps/main/templates/campaign.html b/apps/main/templates/campaign.html
index 56bc435..23f7bba 100644
--- a/apps/main/templates/campaign.html
+++ b/apps/main/templates/campaign.html
@@ -54,9 +54,11 @@
 			{% endfor %}
 		  </table>		  
 	      </div>
-	    </div>
+	    </div>	    
 	  </div>
 	</div>
+	<br>
+	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_mix">Mix Experiments</button>
 {% endblock %}
 
 {% block sidebar%}
@@ -73,6 +75,10 @@
   $("#bt_edit").click(function() {
 	    document.location = "{% url 'url_edit_campaign' campaign.id %}";
 	  });
+	  
+  $("#bt_mix").click(function() {
+        document.location = "{% url 'url_mix_campaign' campaign.id %}";
+      });
   
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/dev_conf_edit.html b/apps/main/templates/dev_conf_edit.html
index fdba05c..73cdc15 100644
--- a/apps/main/templates/dev_conf_edit.html
+++ b/apps/main/templates/dev_conf_edit.html
@@ -1,48 +1,38 @@
-{% extends "base.html" %}
+{% extends "base_edit.html" %}
 {% load bootstrap3 %}
 {% load static %}
 {% load main_tags %}
 
-{% block conf-active %}active{% endblock %}
-
-{% block content-title %}{{title}}{% endblock %}
-{% block content-suptitle %}{{suptitle}}{% endblock %}
-
-{% block content %}
-
-{% if form.is_multipart %}
-    <form class="form" enctype="multipart/form-data" method="post" action="{{action}}">
-{% else %}
-    <form class="form" method="post" action="{{action}}">
-{% endif %}
-
-  {% csrf_token %}
-  {% bootstrap_form form layout='horizontal' size='medium' %}
-  <div style="clear: both;"></div>
-  <br>
-  {% if extra_button %}
-  <div class="pull-left">
-  <button type="button" class="btn btn-primary" id="bt_{{extra_button}}">{{extra_button}}</button>  
-  </div>
-  {% endif %}
-  <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 %}
-
-{% block sidebar%}
-{% include "sidebar_devices.html" %}
-{% endblock %}
 
 {% block extra-js%}
+
 {% if id_exp %}
+
 <script type="text/javascript">
+
   $("#id_device").change(function() {
     var url = "{% url 'url_add_dev_conf' id_exp  %}";
-    document.location = url+ $(this).val() + "/";
+    document.location = url+ $(this).val() + "/?name=" + $("#id_name").val();
+  });
+
+  $('#id_create_from').change(function() {
+    var url = "{% url 'url_add_dev_conf' id_exp %}";
+    if ($(this).val()=="2"){      
+      document.location = url+"?template=0";
+    }else if ($(this).val()=="1"){
+      document.location = url+"?blank=0";
+    }else{
+      document.location = url;
+    }
+  });
+  
+  $('#id_choose_template').change(function() {
+    var url = "{% url 'url_add_dev_conf' id_exp %}";          
+    document.location = url+"?template="+$(this).val();
   });
+
 </script>
+
 {% endif %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/experiment_mix.html b/apps/main/templates/experiment_mix.html
new file mode 100644
index 0000000..32f853a
--- /dev/null
+++ b/apps/main/templates/experiment_mix.html
@@ -0,0 +1,14 @@
+{% extends "base_edit.html" %}
+{% load bootstrap3 %}
+{% load static %}
+{% load main_tags %}
+{% block extra-head %}
+<link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
+{% endblock %}
+
+{% block extra-js%}
+<script src="{% static 'js/moment.min.js' %}"></script>
+<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
+<script src="{% static 'js/cr.js' %}"></script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/sidebar_devices.html b/apps/main/templates/sidebar_devices.html
index 793d80a..0e1eac0 100644
--- a/apps/main/templates/sidebar_devices.html
+++ b/apps/main/templates/sidebar_devices.html
@@ -30,7 +30,7 @@
 		  </div>
 		  <div class="list-group"> 
 		  {% for item in side_configurations %}
-		    <a href="{{item.get_absolute_url}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item.device.name}}</a>      
+		    <a href="{{item.get_absolute_url}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item}}</a>      
 		  {% endfor %}
 		  </div>
 		</div>