diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 35457dc..83aebe3 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -64,6 +64,15 @@
 
 <div class="container">
     <div id="page" class="row" style="min-height:600px">
+
+	   <div class="col-md-3 hidden-xs hidden-sm" role="complementary">
+	   <br><br>
+	       <div id="sidebar">
+	       {% block sidebar%}          
+           {% endblock %}
+	       </div>
+	   </div>	
+	   
 	   <div class="col-md-9 col-xs-12" role="main">
 	   <div class="page-header">
         <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1>
@@ -75,13 +84,8 @@
 	   {% block messages %}
 	   {% endblock %}
 	   </div>
-	   <div class="col-md-3 hidden-xs hidden-sm" role="complementary">
-	   <br><br>
-	       <div id="sidebar">
-	       {% block sidebar%}          
-           {% endblock %}
-	       </div>
-	   </div>	  
+	     
+	   
 	</div><!--/row-->	
 </div> <!-- container -->
 
diff --git a/apps/main/templates/conf_device.html b/apps/main/templates/conf_device.html
new file mode 100644
index 0000000..cbdf82f
--- /dev/null
+++ b/apps/main/templates/conf_device.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% load bootstrap3 %}
+{% block mainactive %}active{% endblock %}
+
+{% block content-title %}{{experiment.alias}}{% endblock %}
+{% block content-suptitle %}{{device.device_type__name}}{% endblock %}
+
+{% block content %}
+<form class="form" method="post" action="">
+{% csrf_token %}
+{% bootstrap_form form layout='horizontal' size='medium' %}
+<div style="clear: both;"></div>
+<br>
+<button type="submit" class="btn btn-primary pull-right" id="bt_update">Send</button>
+</form>
+{% endblock %}
+
+{% block sidebar%}
+{% include "sidebar_devices.html" %}
+{% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/sidebar_devices.html b/apps/main/templates/sidebar_devices.html
index efc5c98..87831ef 100644
--- a/apps/main/templates/sidebar_devices.html
+++ b/apps/main/templates/sidebar_devices.html
@@ -1,3 +1,14 @@
+{% if experiment %}
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3>Experiment</h3>
+  </div>
+  <div class="list-group"> 
+  	<a href="{% url 'experiment' experiment.id %}" class="list-group-item active" >{{ experiment.alias }}</a>
+  </div>
+</div>
+{% endif %}
+
 {% if devices %}
 <div class="panel panel-default">
   <div class="panel-heading">
@@ -5,7 +16,7 @@
   </div>
   <div class="list-group">
   {% for item in devices %}
-    <a href="/{{item.device_type__alias}}/{{item.configuration__id}}/" class="list-group-item {{item.active}}"><h4>{{item.device_type__name}}</h4></a>      
+    <a href="/{{item.device_type__alias}}/{{item.configuration__id}}/" class="list-group-item {{item.active}}">{{item.device_type__alias}}</a>      
   {% endfor %}
   </div>
 </div>