diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 1f8b87c..613ee93 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -1,4 +1,4 @@
-{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises%}
+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises %}
 
 <div class="panel panel-default cards-detail">
   <div class="panel-heading topic">
@@ -112,6 +112,7 @@
             <ul>
               {% list_topic_poll request topic %}
               {% list_topic_foruns request topic %}
+              {% list_topic_exercise request topic %}
             </ul>
           </div>
           <div class="editation editation_{{topic.slug}}">
@@ -122,6 +123,13 @@
               {% list_topic_foruns request topic %}
             </ul>
           </div>
+          <div class="editation editation_{{topic.slug}}">
+
+            {# exercícios do tópico no modo de edição #}
+            <ul>
+              {% list_topic_exercise_edit request topic %}
+            </ul>
+          </div>
         </div>
       </div>
 
diff --git a/exercise/forms.py b/exercise/forms.py
index c76c054..fcb4930 100644
--- a/exercise/forms.py
+++ b/exercise/forms.py
@@ -7,10 +7,21 @@ import requests
 
 class ExerciseForm(forms.ModelForm):
 
+    def __init__(self, *args, **kwargs):
+        super(ExerciseForm, self).__init__(*args, **kwargs)
+        self.fields["allowed"].required = False
+        self.fields["allowed"].initial = False
+
+    # def clean_allowed(self):
+    #     if('allowed' in self.data):
+    #         allowed = self.data['allowed']
+    #         raise forms.ValidationError(_('It is required one these fields.'))
+    #     return True
+
     class Meta:
         model = Exercise
         fields = ['name_exercise', 'description',
-                    'end_date', 'file']
+                    'end_date', 'file', 'allowed']
 
 
 class UpdateExerciseForm(forms.ModelForm):
@@ -18,4 +29,4 @@ class UpdateExerciseForm(forms.ModelForm):
     class Meta:
         model = Exercise
         fields = ['name_exercise', 'description',
-                    'end_date', 'grade', 'file']
+                    'end_date', 'file']
diff --git a/exercise/migrations/0005_exercise_allowed.py b/exercise/migrations/0005_exercise_allowed.py
new file mode 100644
index 0000000..f80cfd8
--- /dev/null
+++ b/exercise/migrations/0005_exercise_allowed.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-21 12:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exercise', '0004_auto_20161121_0922'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='exercise',
+            name='allowed',
+            field=models.BooleanField(default=False, verbose_name='Allowed delivery after end date?'),
+        ),
+    ]
diff --git a/exercise/migrations/0006_auto_20161121_1008.py b/exercise/migrations/0006_auto_20161121_1008.py
new file mode 100644
index 0000000..c0da128
--- /dev/null
+++ b/exercise/migrations/0006_auto_20161121_1008.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-21 13:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import exercise.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exercise', '0005_exercise_allowed'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exercise',
+            name='file',
+            field=models.FileField(upload_to=exercise.models.file_path, verbose_name='File'),
+        ),
+    ]
diff --git a/exercise/migrations/0007_auto_20161121_1019.py b/exercise/migrations/0007_auto_20161121_1019.py
new file mode 100644
index 0000000..8b4e5f7
--- /dev/null
+++ b/exercise/migrations/0007_auto_20161121_1019.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-21 13:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exercise', '0006_auto_20161121_1008'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exercise',
+            name='file',
+            field=models.FileField(upload_to='uploads/%Y/%m/%d'),
+        ),
+    ]
diff --git a/exercise/models.py b/exercise/models.py
index 4f7a071..df0c25a 100644
--- a/exercise/models.py
+++ b/exercise/models.py
@@ -30,6 +30,7 @@ class Exercise(models.Model):
     students = models.ManyToManyField(User, verbose_name=_('Students'), related_name='subject_exercise', blank = True)
     file = models.FileField(upload_to='uploads/%Y/%m/%d')
     file_type = models.ForeignKey(MimeType, verbose_name=_('Type file'), related_name='exercise_type',null=True)
+    allowed = models.BooleanField(_('Allowed delivery after end date?'), default=False)
 
     def __str__(self):
         return self.name_exercise
diff --git a/exercise/templates/exercise/create_exercise.html b/exercise/templates/exercise/create_exercise.html
index e4c2cf3..87d5e92 100644
--- a/exercise/templates/exercise/create_exercise.html
+++ b/exercise/templates/exercise/create_exercise.html
@@ -41,10 +41,10 @@
                   </span>
                 </div>
                 {% else %}
-                {% render_field field class='form-control input-sm' %}
-                <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+                  {% render_field field class='form-control input-sm' %}
+                  <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
                 {% endif %}
-              </div>
+                </div>
 
               {% if field.errors %}
               <div class="alert alert-danger alert-dismissible clearfix" role="alert">
@@ -97,6 +97,7 @@
         $('#list-topic{{ topic.id }}-exercises').append(data);
         $('#list-topic{{ topic.id }}-exercises-edit').append(data);
         alertify.success('Exercise successfully created!')
+        setTimeout(function () { location.reload(1); }, 1000);
       },
       error: function(data){
         $('#requisicoes_ajax').empty();
diff --git a/exercise/templates/exercise/exercise_edit.html b/exercise/templates/exercise/exercise_edit.html
index a398412..938a57d 100644
--- a/exercise/templates/exercise/exercise_edit.html
+++ b/exercise/templates/exercise/exercise_edit.html
@@ -2,6 +2,6 @@
 <div id="exercise-topic{{ topic.id }}-exercises-edit">
   {% for exercise in exercises %}
     <li class="icon_edit_remove" id = "exercise_edit_icon_{{ exercise.slug }}"> <a href="javascript:modal.get('', '#exercisesModalEdit', '#requisicoes_ajax')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:modal.get('', '#exerciseDeleteModal', '#requisicoes_ajax')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
-    <li id = "exercise_edit_{{ exercise.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:modal.get('', '#viewExerciseModal','#requisicoes_ajax')">{{exercise.name}}</a></li>
+    <li id = "exercise_edit_{{ exercise.slug }}"><i class="fa fa-file" aria-hidden="true"></i>  <a href="javascript:modal.get('', '#viewExerciseModal','#requisicoes_ajax')">{{exercise.name_exercise}}</a></li>
   {% endfor %}
 </div>
diff --git a/exercise/templates/exercise/exercise_list.html b/exercise/templates/exercise/exercise_list.html
index a6763db..3b5a44f 100644
--- a/exercise/templates/exercise/exercise_list.html
+++ b/exercise/templates/exercise/exercise_list.html
@@ -1,6 +1,6 @@
 {% load static i18n list_topic_foruns permission_tags %}
 <div id="list-topic{{ topic.id }}-exercises">
 {% for exercise in exercises %}
-        <li id="exercise_{{ exercise.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="{{exercise.file.url}}">{{exercise.name}}</a></li>
+    <li id="exercise_{{ exercise.slug }}"><i class="fa fa-file" aria-hidden="true"></i>  <a href="{{exercise.file.url}}">{{exercise.name_exercise}}</a></li>
 {% endfor %}
 </div>
--
libgit2 0.21.2