diff --git a/datacenterlight/templates/datacenterlight/cms/banner_list.html b/datacenterlight/templates/datacenterlight/cms/banner_list.html
index ed1a3d49..7ef1c1c5 100644
--- a/datacenterlight/templates/datacenterlight/cms/banner_list.html
+++ b/datacenterlight/templates/datacenterlight/cms/banner_list.html
@@ -1,4 +1,4 @@
-{% load static i18n cms_tags %}
+{% load cms_tags %}
 
 <div class="banner-list" id="{{ instance.html_id }}">
   <div class="container">
diff --git a/datacenterlight/templates/datacenterlight/cms/base.html b/datacenterlight/templates/datacenterlight/cms/base.html
index a6123cc3..e9ca7a12 100644
--- a/datacenterlight/templates/datacenterlight/cms/base.html
+++ b/datacenterlight/templates/datacenterlight/cms/base.html
@@ -1,4 +1,4 @@
-{% load static i18n cms_tags sekizai_tags %}
+{% load static cms_tags sekizai_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 
 <!DOCTYPE html>
diff --git a/datacenterlight/templates/datacenterlight/cms/contact.html b/datacenterlight/templates/datacenterlight/cms/contact.html
index 32919668..b340a911 100644
--- a/datacenterlight/templates/datacenterlight/cms/contact.html
+++ b/datacenterlight/templates/datacenterlight/cms/contact.html
@@ -1,5 +1,3 @@
-{% load i18n %}
-
 <div id="{{ instance.id }}" class="full-contact-section">
   <div class="intro-header-2 contact-section">
     <div class="container">
diff --git a/datacenterlight/templates/datacenterlight/cms/link.html b/datacenterlight/templates/datacenterlight/cms/link.html
index 081f8551..c05db999 100644
--- a/datacenterlight/templates/datacenterlight/cms/link.html
+++ b/datacenterlight/templates/datacenterlight/cms/link.html
@@ -1,5 +1,3 @@
-{% load cms_tags %}
-
 <a class="dcl-link url {% if instance.separator %}dcl-link-separator{% endif %}" href="{{ instance.target }}" {% if instance.title %}title="{{ instance.title }}"{% endif %}>
   {{ instance.text }}
 </a>
\ No newline at end of file
diff --git a/datacenterlight/templates/datacenterlight/cms_page.html b/datacenterlight/templates/datacenterlight/cms_page.html
deleted file mode 100644
index a6201b39..00000000
--- a/datacenterlight/templates/datacenterlight/cms_page.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "datacenterlight/base.html" %}
-{% load staticfiles cms_tags sekizai_tags %}
-
-{% block css_extra %}
-    <link href="{% static 'datacenterlight/css/cms.css' %}" media="screen" rel="stylesheet" type="text/css"/>
-{% endblock css_extra %}
-
-{% block title %}
-    {% page_attribute page_title %}
-{% endblock %}
-
-{% block content %}
-    <div class="dcl-header">
-        <div class="container">
-            <h1>{% page_attribute page_title %}</h1>
-        </div>
-    </div>
-
-    <div class="split-section left">
-        <div class="space">
-            <div class="container">
-                {% placeholder 'datacenterlight_cms_page_text' %}
-            </div>
-        </div>
-    </div>
-{% endblock %}
diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html
index 828a5d19..4a2d8786 100644
--- a/datacenterlight/templates/datacenterlight/includes/_footer.html
+++ b/datacenterlight/templates/datacenterlight/includes/_footer.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n%}
+{% load i18n %}
 
 <footer>
     <div class="container">
diff --git a/hosting/templates/hosting/calculator_form.html b/hosting/templates/hosting/calculator_form.html
index 0a7bc3e2..02bb36ea 100644
--- a/hosting/templates/hosting/calculator_form.html
+++ b/hosting/templates/hosting/calculator_form.html
@@ -71,6 +71,15 @@
                     {% endfor %}
                 </select>
             </div>
+            <div class="help-block with-errors">
+                {% for message in messages %}
+                    {% if 'cores' in message.tags %}
+                     <ul class="list-unstyled"><li>
+                        {{ message|safe }}
+                    </li></ul>
+                    {% endif %}
+                {% endfor %}
+            </div>
         </div>
         <input type="hidden" name="total">
     </div>
