diff --git a/layerindex/views.py b/layerindex/views.py
index 1efab86..70ba3e1 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -22,6 +22,7 @@ from django.template.loader import get_template
 from django.template import Context
 from django.utils.decorators import method_decorator
 from django.contrib.auth.decorators import login_required
+from django.contrib import messages
 from reversion.models import Revision
 import simplesearch
 import settings
@@ -163,7 +164,7 @@ def edit_layer_view(request, template_name, slug=None):
                         msg = EmailMessage(subject, text_content, from_email, [to_email])
                         msg.send()
                     return HttpResponseRedirect(reverse('submit_layer_thanks'))
-            form.was_saved = True
+            messages.success(request, 'Layer %s saved successfully.' % layeritem.name)
     else:
         form = EditLayerForm(request.user, layerbranch, instance=layeritem)
         maintainerformset = LayerMaintainerFormSet(instance=layerbranch)
diff --git a/settings.py b/settings.py
index bc66902..29f7a09 100644
--- a/settings.py
+++ b/settings.py
@@ -169,6 +169,14 @@ LOGGING = {
     }
 }
 
+from django.contrib.messages import constants as messages
+MESSAGE_TAGS = {
+    messages.SUCCESS: 'alert-success',
+    messages.INFO: 'alert-info',
+    messages.WARNING: '',
+    messages.ERROR: 'alert-error',
+}
+
 # Registration settings
 ACCOUNT_ACTIVATION_DAYS = 2
 EMAIL_HOST = 'smtp.example.com'
diff --git a/templates/base.html b/templates/base.html
index f075dee..a1cdf44 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -98,6 +98,11 @@
     {% endblock %}
 
     <div id="content" class="container top-padded">
+        {% if messages %}
+            {% for message in messages %}
+            <div{% if message.tags %} class="alert {{ message.tags }}"{% endif %}>{{ message }}</div>
+            {% endfor %}
+        {% endif %}
         {% block content %}{% endblock %}
     </div>
 
diff --git a/templates/layerindex/editlayer.html b/templates/layerindex/editlayer.html
index e859d6d..714a89a 100644
--- a/templates/layerindex/editlayer.html
+++ b/templates/layerindex/editlayer.html
@@ -31,11 +31,6 @@
         {% endblock %}
 
 {% block formtop %}
-{% if form.was_saved %}
-    <div class="alert alert-success">
-        Changes saved successfully.
-    </div>
-{% endif %}
 {% endblock %}
 <form id="edit_layer_form" method="post">
 {% csrf_token %}