diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index a2e25a4..39aecf3 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -404,6 +404,7 @@ ul, li {
 .dropdown-menu .pull-right {
     right: 0;
   }
+  .editation{display: none}
 .moreAccordion{ padding-left: 0px; padding-right: 0px;}
 .moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
 .cards-content{ padding-left: 0px; padding-right: 0px; }
diff --git a/courses/static/js/topic_editation_presentation.js b/courses/static/js/topic_editation_presentation.js
index 2aaacbf..7a6cdd4 100644
--- a/courses/static/js/topic_editation_presentation.js
+++ b/courses/static/js/topic_editation_presentation.js
@@ -1,8 +1,9 @@
-$(".edit_card").on('click', function() {
-    $(".presentation").css('display','none');
-    $(".editation").css('display','block');
-})
-$(".edit_card_end").on('click', function() {
-    $(".editation").css('display','none');
-    $(".presentation").css('display','block');
-})
\ No newline at end of file
+function show_editation(id_topic){
+    $("#presentation_"+ id_topic).css('display','none');
+    $("#editation_"+ id_topic).css('display','block');
+}
+
+function show_presentation(id_topic){
+    $("#editation_"+ id_topic).css('display','none');
+    $("#presentation_"+ id_topic).css('display','block');
+}
\ No newline at end of file
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 107ff48..966a816 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -16,7 +16,7 @@
         <a role="button">
           <h4>{{topic}}</h4>
         </a>
-      </div><!--column-->
+      </div><!--column -->
       <div class="col-xs-3 col-md-2 divMoreActions">
         <div class="btn-group">
           <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
@@ -31,7 +31,7 @@
           {% if dropdown_topic %}
           <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
             <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
-            <li><a href="javascript:void(0)" class="edit_card"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
+            <li><a href="javascript:show_editation('{{topic.slug}}')"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
             <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
           </ul>
           {% endif %}
@@ -41,7 +41,7 @@
   </div>
   <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
     <div class="panel-body">
-      <div class="presentation">
+      <div class="presentation" id="presentation_{{topic.slug}}">
         <p>
           <i>
             {{topic.description|linebreaks}}
@@ -86,7 +86,7 @@
           </div>
         </div>
       </div><!--EndPresentation-->
-      <div class="editation">
+      <div class="editation" id="editation_{{topic.slug}}">
         <div class="form-group">
           <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
           <input type="text" class="form-control" value="{{topic}}">
@@ -135,8 +135,8 @@
         </div>
         <div class="form-group">
           <div class="col-md-10">
-            <button type="button" class="btn btn-raised btn-default edit_card_end">{% trans 'Cancel' %}</button>
-            <button type="submit" class="btn btn-raised btn-primary edit_card_end">{% trans 'Submit' %}</button>
+            <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
+            <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
           </div>
         </div>
       </div><!--EndEditation-->
--
libgit2 0.21.2