diff --git a/links/forms.py b/links/forms.py
index 6721de1..5025282 100644
--- a/links/forms.py
+++ b/links/forms.py
@@ -26,11 +26,16 @@ class LinkForm(forms.ModelForm):
 
 	tags = forms.CharField(label = _('Tags'), required = False)
 	link_url = forms.URLField(label = _('Website URL'),required=True)
+	initial_view_date = forms.DateField(input_formats=['%Y/%m/%d', '%d/%m/%Y', '%m/%d/%Y'])
+	end_view_date = forms.DateField(input_formats=['%Y/%m/%d', '%d/%m/%Y', '%m/%d/%Y'])
+
 	class Meta:
 		model = Link
 		fields = ['name','link_url', 'initial_view','initial_view_date', 'end_view','end_view_date', 'brief_description', 'all_students', 'students', 'groups', 'visible']
 		labels = {
 			'name': _('Link name'),
+			'end_view' : _('End View'),
+			'end_view_date': _('End View Date')
 		}
 		widgets = {
 			'brief_description': forms.Textarea,
@@ -38,6 +43,31 @@ class LinkForm(forms.ModelForm):
 			'groups': forms.SelectMultiple,
 		}
 
+	def clean(self):
+
+		cleaned_data = self.cleaned_data
+
+		if cleaned_data.get('end_view'):
+			end_view = cleaned_data.get('end_view')
+			if end_view:
+				if cleaned_data.get('end_view_date'):
+					end_view_date = cleaned_data.get('end_view_date')
+					print(end_view_date)
+					if not end_view_date:
+						raise ValidationError(_('End View Date is not set'), code='invalid' )
+
+		if cleaned_data.get('initial_view'):
+			initial_view = cleaned_data.get('initial_view')
+			if initial_view:
+				if cleaned_data.get('initial_view_date'):
+					initial_view_date = cleaned_data.get('initial_view_date')
+					print(initial_view_date)
+					if not initial_view_date:
+						raise ValidationError(_('Initial View Date is not set'), code='invalid' )
+
+		return cleaned_data
+	
+
 	def clean_name(self):
 		name = self.cleaned_data.get('name', '')
 		
@@ -50,12 +80,13 @@ class LinkForm(forms.ModelForm):
 				same_name = topic.resource_topic.filter(name__unaccent__iexact = name).count()
 		
 			if same_name > 0:
-				self._errors['name'] = [_('This subject already has a link with this name')]
+				self._errors['name'] = [_('There is already a link with this name on this subject')]
 
 				return ValueError
 
 		return name
 
+
 	
 
 	def save(self, commit = True):
diff --git a/links/templates/links/_form.html b/links/templates/links/_form.html
index f7c72b4..fa4b616 100644
--- a/links/templates/links/_form.html
+++ b/links/templates/links/_form.html
@@ -4,6 +4,8 @@
 <form method="post" action="" enctype="multipart/form-data">
 	{% csrf_token %}
 
+	{{form.non_field_errors}}
+
 	{% render_field form.control_subject %}
 
 	<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
@@ -90,7 +92,7 @@
 	<div class="form-group{% if form.has_error %} has-error {% endif %}">
 		<label for="{{ form.initial_view_date.auto_id }}">{{ form.initial_view_date.label }}</label>
 		
-		{% render_field form.initial_view_date class='form-control datetime-picker'   %}
+		{% render_field form.initial_view_date class='form-control date-picker'   %}
 
 		<span id="helpBlock" class="help-block">{{ form.initial_view.help_text }}</span>
 			
@@ -131,6 +133,50 @@
 		{% endif %}
 	</div>
 
+	<div class="form-group{% if form.has_error %} has-error {% endif %}">
+		<label for="{{ form.end_view_date.auto_id }}">{{ form.end_view_date.label }}</label>
+		
+		{% render_field form.end_view_date class='form-control date-picker'   %}
+
+		<span id="helpBlock" class="help-block">{{ form.end_view.help_text }}</span>
+			
+		{% if form.end_view_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 form.end_view_date.errors %}
+						<li>{{ error }}</li>
+					{% endfor %}
+				</ul>
+			</div>
+		{% endif %}
+	</div>
+
+	<div class="form-group{% if form.has_error %} has-error {% endif %}">
+		<div class=" checkbox">
+			<label for="{{ form.end_view.auto_id }}">
+				{% render_field form.end_view %} {{ form.end_view.label }}
+			</label>
+		</div>
+
+		<span id="helpBlock" class="help-block">{{ form.end_view.help_text }}</span>
+			
+		{% if form.end_view.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 form.end_view.errors %}
+						<li>{{ error }}</li>
+					{% endfor %}
+				</ul>
+			</div>
+		{% endif %}
+	</div>
+
 
 	<div class=" form-group panel-group" id="professors_accordion" role="tablist" aria-multiselectable="true">
 		<div class="panel panel-info">
diff --git a/links/templates/links/create.html b/links/templates/links/create.html
index 41b1001..7f66d4f 100644
--- a/links/templates/links/create.html
+++ b/links/templates/links/create.html
@@ -17,7 +17,7 @@
 
 	{% breadcrumb topic 'subjects:topic_view' topic.subject.slug topic.slug %}
 	
-	{% trans 'Create File Link' as bread %}
+	{% trans 'Create Website Link' as bread %}
 	{% breadcrumb bread 'links:create' topic.slug %}
 {% endblock %}
 
diff --git a/links/views.py b/links/views.py
index 5f46845..cb0bf0b 100644
--- a/links/views.py
+++ b/links/views.py
@@ -12,6 +12,7 @@ from log.mixins import LogMixin
 from log.decorators import log_decorator_ajax
 from log.models import Log
 
+from django.contrib import messages
 from pendencies.forms import PendenciesForm
 
 from amadeus.permissions import has_subject_permissions, has_resource_permissions
--
libgit2 0.21.2