diff --git a/webpage/forms.py b/webpage/forms.py
index 8342ff4..99c8fad 100644
--- a/webpage/forms.py
+++ b/webpage/forms.py
@@ -1,20 +1,15 @@
 # coding=utf-8
 from django import forms
-from django.forms.models import inlineformset_factory
 from django.utils.translation import ugettext_lazy as _
 from django.utils.html import strip_tags
 
-from pendencies.forms import PendenciesForm
-from pendencies.models import Pendencies
-
 from subjects.models import Tag
 
 from .models import Webpage
 
 class WebpageForm(forms.ModelForm):
 	subject = None
-	control_subject = forms.CharField(widget = forms.HiddenInput())
-
+	
 	def __init__(self, *args, **kwargs):
 		super(WebpageForm, self).__init__(*args, **kwargs)
 
@@ -23,8 +18,6 @@ class WebpageForm(forms.ModelForm):
 		if self.instance.id:
 			self.subject = self.instance.topic.subject
 			self.initial['tags'] = ", ".join(self.instance.tags.all().values_list("name", flat = True))
-
-		self.initial['control_subject'] = self.subject.id
 		
 		self.fields['students'].queryset = self.subject.students.all()
 		self.fields['groups'].queryset = self.subject.group_subject.all()
@@ -101,6 +94,4 @@ class WebpageForm(forms.ModelForm):
 			if not new_tag in self.instance.tags.all():
 				self.instance.tags.add(new_tag)
 
-		return self.instance
-
-InlinePendenciesFormset = inlineformset_factory(Webpage, Pendencies, form = PendenciesForm, extra = 1, can_delete = True)
\ No newline at end of file
+		return self.instance
\ No newline at end of file
diff --git a/webpage/templates/webpages/_form.html b/webpage/templates/webpages/_form.html
index c053d8b..00d16dc 100644
--- a/webpage/templates/webpages/_form.html
+++ b/webpage/templates/webpages/_form.html
@@ -102,103 +102,98 @@
             	</div>
             </div>
             <div id="notifications" class="panel-collapse collapse">
-            	{{ pendencies_form.management_form }}
-                {{ pendencies_form.non_form_errors }}
-
-            	{% for notify in pendencies_form %}
-            		<div class="notifies">
-            			<div style="text-align:left">
-	            			{% if notify.instance.pk %}{{ notify.DELETE }}{% endif %}
-	            			{% render_field notify.id %}
-	            			{% render_field notify.resource %}
-	            			{% render_field notify.subject class='pend_subj' %}
-		            		
-		            		<div class="form-group{% if notify.has_error %} has-error {% endif %} row">
-		            			<label for="{{ notify.action.auto_id }}" class="pull-left action_label contol-label">
-		            				{% trans 'Action not performed by the user' %}: 
-		        				</label>
-		        				<div class="col-md-3">
-		        					{% render_field notify.action class='form-control' %}
-		        				</div>
-
-		        				<br clear="all" />
-
-		        				<span id="helpBlock" class="help-block">{{ notify.action.help_text }}</span>
-			
-								{% if notify.action.errors %}
-									<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 notify.action.errors %}
-												<li>{{ error }}</li>
-											{% endfor %}
-										</ul>
-									</div>
-								{% endif %}
-		            		</div>
-		            		<br clear="all" />
-		            		<div class="row">
-		            			<div class="col-md-offset-2">
-		            				<p>{% trans 'Wished period' %}: </p>
-		            			</div>
-		            		</div>
-		            		<div class="form-group{% if notify.has_error %} has-error {% endif %} row">
-		            			<div class="col-lg-offset-3 col-md-offset-3 col-sm-offset-3 col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
-							        <label>
-				      					{% render_field notify.begin_date_check class="begin_date" %} {{ notify.begin_date.label }}
-				  					</label>
-						        </div>
-						        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
-						        	{% render_field notify.begin_date class='form-control datetime-picker begin_date_input' %}
-						        </div>						        
-		            		</div>
-		            		<div class="row">
-		            			<span id="helpBlock" class="help-block">{{ notify.begin_date.help_text }}</span>
-			
-								{% if notify.begin_date.errors %}
-									<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 notify.begin_date.errors %}
-												<li>{{ error }}</li>
-											{% endfor %}
-										</ul>
-									</div>
-								{% endif %}
-		            		</div>
-		            		<div class="form-group{% if notify.has_error %} has-error {% endif %} row">
-		            			<div class="col-lg-offset-3 col-md-offset-3 col-sm-offset-3 col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
-							        <label>
-				      					{% render_field notify.end_date_check class="end_date" %} {{ notify.end_date.label }}
-				  					</label>
-						        </div>
-						        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
-						        	{% render_field notify.end_date class='form-control datetime-picker end_date_input' %}
-						        </div>
-		            		</div>
-		            		<div class="row">
-		            			<span id="helpBlock" class="help-block">{{ notify.end_date.help_text }}</span>
-			
-								{% if notify.end_date.errors %}
-									<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 notify.end_date.errors %}
-												<li>{{ error }}</li>
-											{% endfor %}
-										</ul>
-									</div>
-								{% endif %}
-		            		</div>
-		            	</div>
+            	
+        		<div class="notifies">
+        			<div style="text-align:left">
+            			{% render_field pendencies_form.id %}
+            			{% render_field pendencies_form.resource %}
+            			{% render_field pendencies_form.subject class='pend_subj' %}
+	            		
+	            		<div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
+	            			<label for="{{ pendencies_form.action.auto_id }}" class="pull-left action_label contol-label">
+	            				{% trans 'Action not performed by the user' %}: 
+	        				</label>
+	        				<div class="col-md-3">
+	        					{% render_field pendencies_form.action class='form-control' %}
+	        				</div>
+
+	        				<br clear="all" />
+
+	        				<span id="helpBlock" class="help-block">{{ pendencies_form.action.help_text }}</span>
+		
+							{% if pendencies_form.action.errors %}
+								<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 pendencies_form.action.errors %}
+											<li>{{ error }}</li>
+										{% endfor %}
+									</ul>
+								</div>
+							{% endif %}
+	            		</div>
+	            		<br clear="all" />
+	            		<div class="row">
+	            			<div class="col-md-12">
+	            				<p>{% trans 'Wished period' %}: </p>
+	            			</div>
+	            		</div>
+	            		<div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
+	            			<div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
+						        <label>
+			      					{% render_field pendencies_form.begin_date_check class="begin_date" %} {{ pendencies_form.begin_date.label }}
+			  					</label>
+					        </div>
+					        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
+					        	{% render_field pendencies_form.begin_date class='form-control datetime-picker begin_date_input' %}
+					        </div>						        
+	            		</div>
+	            		<div class="row">
+	            			<span id="helpBlock" class="help-block">{{ pendencies_form.begin_date.help_text }}</span>
+		
+							{% if pendencies_form.begin_date.errors %}
+								<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 pendencies_form.begin_date.errors %}
+											<li>{{ error }}</li>
+										{% endfor %}
+									</ul>
+								</div>
+							{% endif %}
+	            		</div>
+	            		<div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
+	            			<div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
+						        <label>
+			      					{% render_field pendencies_form.end_date_check class="end_date" %} {{ pendencies_form.end_date.label }}
+			  					</label>
+					        </div>
+					        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
+					        	{% render_field pendencies_form.end_date class='form-control datetime-picker end_date_input' %}
+					        </div>
+	            		</div>
+	            		<div class="row">
+	            			<span id="helpBlock" class="help-block">{{ pendencies_form.end_date.help_text }}</span>
+		
+							{% if pendencies_form.end_date.errors %}
+								<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 pendencies_form.end_date.errors %}
+											<li>{{ error }}</li>
+										{% endfor %}
+									</ul>
+								</div>
+							{% endif %}
+	            		</div>
 	            	</div>
-            	{% endfor %}
+            	</div>
             </div>
         </div>
 
@@ -333,40 +328,16 @@
 </form>
 <script type="text/javascript">
 	$(function() {
-		$('.notifies').formset({
-			addText: '{% trans "Add new notification" %}',
-			deleteText: '{% trans "Remove this notification" %}',
-			prefix: '{{ pendencies_form.prefix }}',
-			added: function (row) {
-				var locale = navigator.language || navigator.userLanguage;
-				
-				$(row).find('.datetime-picker').each(function () {
-					$(this).datetimepicker({
-						locale: locale
-					});
-				});
-
-				$('.begin_date_input').on('click', function () {
-			    	var checkbox = $(this).parent().parent().find('.begin_date');
-
-			    	$(checkbox).prop('checked', true);
-			    });
-
-			    $('.end_date_input').on('click', function () {
-			    	var checkbox = $(this).parent().parent().find('.end_date');
-
-			    	$(checkbox).prop('checked', true);
-			    });
-
-			    subject = $("#id_control_subject").val();
-
-			    $(row).find('.pend_subj').val(subject);
-			}
-		});
+		var begin_val = $('.begin_date_input').val(),
+			end_val = $('.end_date_input').val();
 
-		subject = $("#id_control_subject").val();
+		if (begin_val != '') {
+			$(".begin_date").prop('checked', true);
+		}
 
-	    $('.pend_subj').val(subject);
+		if (end_val != '') {
+			$(".end_date").prop('checked', true);
+		}
 
 		{% if not pendencies_form.is_valid and pendencies_form.is_bound %}
 			$("#notifications").collapse('toggle');
diff --git a/webpage/views.py b/webpage/views.py
index b1ef533..c8c344b 100644
--- a/webpage/views.py
+++ b/webpage/views.py
@@ -9,7 +9,9 @@ from amadeus.permissions import has_subject_permissions, has_resource_permission
 
 from topics.models import Topic
 
-from .forms import WebpageForm, InlinePendenciesFormset
+from pendencies.forms import PendenciesForm
+
+from .forms import WebpageForm
 from .models import Webpage
 
 class NewWindowView(LoginRequiredMixin, generic.DetailView):
@@ -81,7 +83,7 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
 		slug = self.kwargs.get('slug', '')
 		topic = get_object_or_404(Topic, slug = slug)
 
-		pendencies_form = InlinePendenciesFormset(initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]}])
+		pendencies_form = PendenciesForm(initial = {'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]})
 
 		return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form))
 
@@ -94,7 +96,7 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
 		slug = self.kwargs.get('slug', '')
 		topic = get_object_or_404(Topic, slug = slug)
 
-		pendencies_form = InlinePendenciesFormset(self.request.POST, initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]}])
+		pendencies_form = PendenciesForm(self.request.POST, initial = {'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]})
 		
 		if (form.is_valid() and pendencies_form.is_valid()):
 			return self.form_valid(form, pendencies_form)
@@ -128,15 +130,12 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
 
 		self.object.save()
 
-		pendencies_form.instance = self.object
-		pendencies_form.save(commit = False)
+		pend_form = pendencies_form.save(commit = False)
+		pend_form.resource = self.object
+		
+		if not pend_form.action == "":
+			pend_form.save() 
 		
-		for pform in pendencies_form.forms:
-			pend_form = pform.save(commit = False)
-
-			if not pend_form.action == "":
-				pend_form.save() 
-
 		return redirect(self.get_success_url())
 
 	def get_context_data(self, **kwargs):
@@ -183,6 +182,24 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
 
 		return super(UpdateView, self).dispatch(request, *args, **kwargs)
 
+	def get(self, request, *args, **kwargs):
+		self.object = self.get_object()
+		
+		form_class = self.get_form_class()
+		form = self.get_form(form_class)
+
+		slug = self.kwargs.get('topic_slug', '')
+		topic = get_object_or_404(Topic, slug = slug)
+
+		pend_form = self.object.pendencies_resource.all()
+
+		if len(pend_form) > 0:
+			pendencies_form = PendenciesForm(instance = pend_form[0], initial = {'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]})
+		else:
+			pendencies_form = PendenciesForm(initial = {'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]})
+
+		return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form))
+
 	def post(self, request, *args, **kwargs):
 		self.object = self.get_object()
 		
@@ -192,7 +209,12 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
 		slug = self.kwargs.get('topic_slug', '')
 		topic = get_object_or_404(Topic, slug = slug)
 
-		pendencies_form = InlinePendenciesFormset(self.request.POST, instance = self.object, initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]}])
+		pend_form = self.object.pendencies_resource.all()
+
+		if len(pend_form) > 0:
+			pendencies_form = PendenciesForm(self.request.POST, instance = pend_form[0], initial = {'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]})
+		else:
+			pendencies_form = PendenciesForm(self.request.POST, initial = {'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]})
 		
 		if (form.is_valid() and pendencies_form.is_valid()):
 			return self.form_valid(form, pendencies_form)
@@ -210,14 +232,11 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
 		
 		self.object.save()
 
-		pendencies_form.instance = self.object
-		pendencies_form.save(commit = False)
+		pend_form = pendencies_form.save(commit = False)
+		pend_form.resource = self.object
 
-		for form in pendencies_form.forms:
-			pend_form = form.save(commit = False)
-
-			if not pend_form.action == "":
-				pend_form.save()
+		if not pend_form.action == "":
+			pend_form.save()
         
 		return redirect(self.get_success_url())
 
@@ -232,10 +251,6 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
 		context['topic'] = topic
 		context['subject'] = topic.subject
 
-		if not self.request.POST:
-			context['form'] = WebpageForm(instance=self.object, initial = {'subject': topic.subject})
-			context['pendencies_form'] = InlinePendenciesFormset(instance=self.object, initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize"))]}])
-
 		return context
 
 	def get_success_url(self):
--
libgit2 0.21.2