diff --git a/categories/views.py b/categories/views.py
index 011870c..a9201f9 100644
--- a/categories/views.py
+++ b/categories/views.py
@@ -198,7 +198,7 @@ class UpdateCategory(LogMixin, UpdateView):
             context['settings_menu_active'] = "settings_menu_active"
         else:
             context['template_extends'] = 'subjects/list.html'
-            context['subjects_menu_active'] = 'subjects_menu_active';
+            context['subjects_menu_active'] = 'subjects_menu_active'
 
         return context
 
diff --git a/subjects/forms.py b/subjects/forms.py
index a9dad87..efeab0a 100644
--- a/subjects/forms.py
+++ b/subjects/forms.py
@@ -16,7 +16,6 @@ class CreateSubjectForm(forms.ModelForm):
         }
 
 
-
 class CreateTagForm(forms.ModelForm):
     class Meta:
         model = Tag
diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html
index a340693..da880c1 100644
--- a/subjects/templates/subjects/subject_card.html
+++ b/subjects/templates/subjects/subject_card.html
@@ -20,7 +20,7 @@
                         </a>
                         <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
                             <li><a href="{% url 'subjects:replicate' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
-                            <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
+                            <li><a href="{% url 'subjects:update' subject.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
                             <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
                         </ul>
                     {% endif %}
@@ -81,7 +81,7 @@
                         </a>
                         <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
                             <li><a href="{% url 'subjects:replicate' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
-                            <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
+                            <li><a href="{% url 'subjects:update' subject.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
                             <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
                         </ul>
                     {% endif %}
diff --git a/subjects/templates/subjects/update.html b/subjects/templates/subjects/update.html
new file mode 100644
index 0000000..1275bf1
--- /dev/null
+++ b/subjects/templates/subjects/update.html
@@ -0,0 +1,107 @@
+{% extends template_extends %}
+
+{% load static i18n %}
+{% load widget_tweaks django_bootstrap_breadcrumbs %}
+
+{% block breadcrumbs %}
+	{{ block.super }}
+	{% with 'Update '|add:object.slug as bread_slug %}
+		{% breadcrumb bread_slug 'subjects:update' %}
+	{% endwith %}
+{% endblock breadcrumbs %}
+
+{% block content %}
+	<div class="card card-content">
+	    <div class="card-body">
+	<form method="post" action="" enctype="multipart/form-data">
+	{% csrf_token %}
+	{% for field in form %}
+		{% if field.auto_id == 'id_students' %}
+			<div class="panel-group" id="coordinators_accordion" role="tablist" aria-multiselectable="true">
+				<div class="panel panel-info">
+        			<div class="panel-heading">
+            			<div class="row">
+                			<div class="col-md-12">
+                    			<a data-parent="#coordinators_accordion" data-toggle="collapse" href="#students">
+                    				<h4 class="panel-title">
+                            			<button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{{ field.label }}</label>
+                    				</h4>
+                    			</a>
+                    		</div>
+                    	</div>
+                    </div>
+                    <div id="students" class="panel-collapse collapse">
+                    	<p><em>{% trans 'Attribute students to subject' %}:</em></p>
+                    	{% render_field field class='form-control' %}
+                    </div>
+                </div>
+			</div>
+		{% elif field.auto_id == 'id_professor' %}
+			<div class="panel-group" id="professors_accordion" role="tablist" aria-multiselectable="true">
+				<div class="panel panel-info">
+        			<div class="panel-heading">
+            			<div class="row">
+                			<div class="col-md-12">
+                    			<a data-parent="#professors_accordion" data-toggle="collapse" href="#professors">
+                    				<h4 class="panel-title">
+                            			<button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{{ field.label }}</label>
+                    				</h4>
+                    			</a>
+                    		</div>
+                    	</div>
+                    </div>
+                    <div id="professors" class="panel-collapse collapse">
+                    	<p><em>{% trans 'Attribute professors to subject' %}:</em></p>
+                    	{% render_field field class='form-control' %}
+                    </div>
+                </div>
+			</div>
+		{% elif field.auto_id == 'id_markers'%}
+			<label> {{field.label}} </label>
+			{% render_field field class='form-control' data-role="tagsinput" %}
+		{% else %}
+			<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
+				{% if field.auto_id != 'id_visible' %}
+					<label for="{{ field.auto_id }}">{{ field.label }}</label>
+				{% endif %}
+				{% if field.auto_id == 'id_visible' %}
+					<div class="checkbox">
+						<label for="{{ field.auto_id }}">
+	      					{% render_field field %} {{field.label}}
+	  					</label>
+					</div>
+				{% elif field.auto_id == 'id_description' or field.auto_id == 'id_description_brief' %}
+					{% render_field field class='form-control text_wysiwyg' %}
+				{% else %}
+					{% render_field field class='form-control' %}
+				{% endif %}
+				<span class="help-block">{{ field.help_text }}</span>
+				{% if field.errors %}
+					<div class="row">
+						</br>
+						<div class="alert alert-danger alert-dismissible" role="alert">
+		  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+		  						<span aria-hidden="true">&times;</span>
+	  						</button>
+							<ul>
+								{% for error in field.errors %}
+									<li>{{ error }}</li>
+								{% endfor %}
+							</ul>
+						</div>
+					</div>
+				{% endif %}
+			</div>
+		{% endif %}
+		
+	{% endfor %}
+		<div class="row text-center">
+			<input type="submit" value="{% trans 'Save' %}" class="btn btn-primary btn-raised" />
+		</div>
+	</form>
+	</div>
+	</div>
+	<br clear="all" />
+	<br clear="all" />
+
+{% endblock %}
\ No newline at end of file
diff --git a/subjects/urls.py b/subjects/urls.py
index af2611e..8abfc23 100644
--- a/subjects/urls.py
+++ b/subjects/urls.py
@@ -6,5 +6,6 @@ urlpatterns = [
 	url(r'^$', views.IndexView.as_view(), name='index'),
 	url(r'^(?P<option>[\w_-]+)/$', views.IndexView.as_view(), name='index'),
 	url(r'^create/(?P<slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='create'),
-	url(r'^replicate/(?P<subject_slug>[\w_-]+)$', views.SubjectCreateView.as_view(), name='replicate'),
+	url(r'^replicate/(?P<subject_slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='replicate'),
+	url(r'^update/(?P<slug>[\w_-]+)/$', views.SubjectUpdateView.as_view(), name='update'),
 ]
\ No newline at end of file
diff --git a/subjects/views.py b/subjects/views.py
index 3423220..7f99019 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -175,3 +175,26 @@ class SubjectCreateView(CreateView):
         return reverse_lazy('subjects:index')
 
 
+
+
+class SubjectUpdateView(LogMixin, UpdateView):
+   
+    model = Subject
+    form_class = CreateSubjectForm
+    template_name = 'subjects/update.html'
+
+    login_url = reverse_lazy("users:login")
+    redirect_field_name = 'next'
+    def get_context_data(self, **kwargs):
+        context = super(SubjectUpdateView, self).get_context_data(**kwargs)
+        context['title'] = _('Update Subject')
+        context['template_extends'] = 'base.html'
+        context['subjects_menu_active'] = 'subjects_menu_active'
+        return context
+
+    def get_success_url(self):
+        
+        
+        messages.success(self.request, _('Subject "%s" was updated on "%s" successfully!')%(self.object.name, self.object.category.name ))
+        return reverse_lazy('subjects:index')
+
--
libgit2 0.21.2