diff --git a/courses/static/js/topic.js b/courses/static/js/topic.js
index 72c532a..3dd445f 100644
--- a/courses/static/js/topic.js
+++ b/courses/static/js/topic.js
@@ -1,8 +1,8 @@
 var topic = {
-  get: function (button, url, id_div, faz){
-    if(!$(id_div + ' div').length || faz == 'true'){
+  get: function (url, id_div, faz,button){
+    if((!$(id_div + ' div').length) || (faz == 'true')){
         var opened = $("#topics").find(".fa-angle-up");
-        
+
         if (opened.length > 0) {
             opened.removeClass("fa-angle-up");
             opened.addClass("fa-angle-down");
@@ -16,20 +16,21 @@ var topic = {
             op_topic.find(".loaded").val("false");
         }
 
-        //Changing button icon
-        button.find("i").removeClass('fa-angle-down');
-        button.find("i").addClass('fa-angle-up');
-        
         $.get(url, function(data){
             $(id_div).empty();
             $(id_div).append(data);
         });
+        if (faz == 'false'){
+            //Changing button icon
+            button.find("i").removeClass('fa-angle-down');
+            button.find("i").addClass('fa-angle-up');
+        }
     } else {
         var loaded = $(id_div).find(".loaded").val();
 
         if (loaded == "true") {
             var opened = $("#topics").find(".fa-angle-up");
-        
+
             opened.removeClass("fa-angle-up");
             opened.addClass("fa-angle-down");
             var op_topic = opened.parent().parent().parent().parent().parent();
@@ -42,7 +43,7 @@ var topic = {
             $(id_div).find(".loaded").val("false");
         } else {
             var opened = $("#topics").find(".fa-angle-up");
-        
+
             opened.removeClass("fa-angle-up");
             opened.addClass("fa-angle-down");
             var op_topic = opened.parent().parent().parent().parent().parent();
@@ -57,7 +58,7 @@ var topic = {
             var opened = $(id_div).parent().parent().find(".fa-angle-down");
             opened.removeClass("fa-angle-down");
             opened.addClass("fa-angle-up");
-            
+
             var log_url = $(id_div).find(".log_url").val();
 
             topicLog(log_url, 0, 'open', id_div);
@@ -93,6 +94,23 @@ var delete_topic = {
   }
 };
 
+var RemoveTopic = {
+  remove: function(url,dados,id_li_link){
+    $("#topic").modal('toggle');
+      $.post(url,dados, function(data){
+        $(id_li_link).remove();
+        $('body').removeClass('modal-open');
+        $("#modal_subject").empty();
+        $(".modal-backdrop.in").remove();
+        alertify.success("Topic removed successfully!");
+      }).fail(function(){
+        $("#modal_subject").empty();
+        $("#modal_subject").append(data);
+        $('#topic').modal('show');
+      });
+  }
+}
+
 function topicLog(url, topic_log_id, action, topic_div) {
     $.ajax({
         url: url,
@@ -109,4 +127,4 @@ function topicLog(url, topic_log_id, action, topic_div) {
             console.log(data);
         }
     })
-}
\ No newline at end of file
+}
diff --git a/courses/templates/topic/delete.html b/courses/templates/topic/delete.html
index 2209fcf..a734685 100644
--- a/courses/templates/topic/delete.html
+++ b/courses/templates/topic/delete.html
@@ -1,7 +1,7 @@
 {% load static i18n permission_tags %}
 
 <!-- Modal (remember to change the ids!!!) -->
-<div class="modal fade" id="topic_delete_{{topic.slug}}" tabindex="-1" role="dialog" aria-labelledby="{{topic.slug}}_delete">
+<div class="modal fade" id="topic" tabindex="-1" role="dialog" aria-labelledby="{{topic.slug}}_delete">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <!-- Modal Header -->
@@ -22,6 +22,13 @@
         <!-- Don't remove that!!!  -->
         <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
         <button type="submit" id="button" form="topic_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
+
+        <script>
+          $("#topic_form").submit(function(event) {
+            RemoveTopic.remove("{% url 'course:delete_topic' topic.slug %}",$(this).serialize(),"#topic_all_{{topic.slug}}");
+            event.preventDefault();
+          });
+        </script>
       </div>
     </div>
   </div>
diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html
index 1e9d1c9..083c5d5 100644
--- a/courses/templates/topic/index.html
+++ b/courses/templates/topic/index.html
@@ -1,10 +1,10 @@
 {% load i18n professor_access %}
 
-<div class="panel panel-default cards-detail">
+<div class="panel panel-default cards-detail" id="topic_all_{{topic.slug}}">
   <div class="panel-heading topic">
     <div class="row">
       <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#topics" href=".collapseTopic-{{topic.slug}}" aria-expanded="false" aria-controls="collapseTopic-{{topic.slug}}">
-        <button class="btn btn-default btn-sm caret-square" onclick="topic.get($(this), '{% url 'course:view_topic' topic.slug %}', '#content_topic_{{topic.slug}}', 'false');"><i class="fa fa-angle-down fa-2x" aria-hidden="true"></i></button>
+        <button class="btn btn-default btn-sm caret-square" onclick="javascript:topic.get('{% url 'course:view_topic' topic.slug %}', '#content_topic_{{topic.slug}}', 'false',$(this));"><i class="fa fa-angle-down fa-2x" aria-hidden="true"></i></button>
       </div>
       <div class="col-xs-9 col-md-9 titleTopic Topic-detail">
         <a role="button">
@@ -13,20 +13,20 @@
       </div><!--column -->
       {# dropdown de topic com as opções de replicar, editar e deletar #}
           {% professor_subject topic.subject user as dropdown_topic %}
-          {% if dropdown_topic %} 
+          {% if dropdown_topic %}
       <div class="col-xs-3 col-md-2 divMoreActions">
         <div class="btn-group">
           <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
           </button>
 
-          
+
           <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
             <li><a href="{% url 'course:replicate_topic' topic.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
             <li><a href="javascript:topic.get('{% url 'course:update_topic' topic.slug %}','#content_topic_{{topic.slug}}','true');"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
-            <li><a href="javascript:delete_topic.get('{% url 'course:delete_topic' topic.slug %}?view=index','#topic_delete_{{topic.slug}}','#modal_topic');"><i class="fa fa-trash fa-fw"  aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
+            <li><a href="javascript:delete_topic.get('{% url 'course:delete_topic' topic.slug %}','#topic','#modal_subject');"><i class="fa fa-trash fa-fw"  aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
           </ul>
-          
+
         </div>
       </div>
       {% endif %}
@@ -34,7 +34,7 @@
   </div>
   <div class="panel-collapse collapseTopic-{{topic.slug}} topic_{{ topic.id }} collapse" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="false" aria-hidden="true">
     <div class="panel-body" id="content_topic_{{topic.slug}}">
-      
+
     </div>
   </div>
 </div>
diff --git a/courses/templates/topic/update.html b/courses/templates/topic/update.html
index 6b2cc62..358dffd 100644
--- a/courses/templates/topic/update.html
+++ b/courses/templates/topic/update.html
@@ -1,6 +1,6 @@
 {% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises course_value_field %}
 
-<form class="" id="form_topic_update" method="post" action="">
+<form class="" id="form_topic_update_{{topic.slug}}" method="post" action="">
   {% csrf_token %}
   {% for field in form %}
   <div class="form-group {% if field.errors %} has-error{% endif %}">
@@ -100,15 +100,15 @@
 <div class="form-group">
   <div class="col-md-10">
     <a href="javascript:topic.get('{% url 'course:view_topic' topic.slug %}','#content_topic_{{topic.slug}}','true');" class="btn btn-raised btn-default">{% trans 'Back' %}</a>
-    <button type="submite" form="form_topic_update" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
+    <button type="submite" form="form_topic_update_{{topic.slug}}" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
   </div>
 </div>
 
 <script type="text/javascript">
   $(document).ready(function() {
-      $('#id_description').summernote();
+      $('#id_description').summernote({height:250});
   });
-  $("#form_topic_update").submit(function(event) {
+  $("#form_topic_update_{{topic.slug}}").submit(function(event) {
     topic.post("{% url 'course:update_topic' topic.slug %}",$(this).serialize(), '#content_topic_{{topic.slug}}');
     event.preventDefault();
   });
diff --git a/courses/views.py b/courses/views.py
index 5e4a116..ad63441 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -331,7 +331,7 @@ class CourseView(LoginRequiredMixin, LogMixin, NotificationMixin, generic.Detail
     model = Course
     context_object_name = 'course'
     template_name = 'course/view.html'
-    
+
 
     def get_context_data(self, **kwargs):
         subjects = None
--
libgit2 0.21.2