diff --git a/links/forms.py b/links/forms.py
index cb680b4..a34380e 100644
--- a/links/forms.py
+++ b/links/forms.py
@@ -50,19 +50,16 @@ class LinkForm(forms.ModelForm):
 		if cleaned_data.get('end_view'):
 			end_view = cleaned_data.get('end_view')
 			if end_view and not cleaned_data.get('end_view_date'):
-				print("here 1")
 				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 and not cleaned_data.get('initial_view_date'):
-					print("here 2")
-					raise ValidationError(_('Initial View Date is not set'), code='invalid' )
+				raise ValidationError(_('Initial View Date is not set'), code='invalid' )
 		if cleaned_data.get('initial_view_date') and cleaned_data.get('end_view_date'):
 			end_view_date = cleaned_data.get('end_view_date')
 			initial_view_date = cleaned_data.get('initial_view_date')
 			if end_view_date < initial_view_date:
-				print("here 3")
 				raise ValidationError(_('End View Date before Initial View Date'), code='invalid' )
 
 		return cleaned_data
diff --git a/links/templates/links/_form.html b/links/templates/links/_form.html
index b0c1a2f..6ee271d 100644
--- a/links/templates/links/_form.html
+++ b/links/templates/links/_form.html
@@ -4,7 +4,18 @@
 <form method="post" action="" enctype="multipart/form-data">
 	{% csrf_token %}
 
-	{{form.non_field_errors}}
+	{% if form.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 key, message in form.errors.items  %}
+				<li>{{message}}</li>
+			{% endfor %}
+			</ul>
+		</div>
+	{% endif %}
 
 	{% render_field form.control_subject %}
 
@@ -388,6 +399,8 @@
 			</div>
 		{% endif %}
 	</div>
+	
+	
 
 	<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
 		<div class="text-center">
--
libgit2 0.21.2