diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index fc8b7a343a..7e20b0222b 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,9 +13,16 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
+//= require vendor
 //= require bootstrap
 //= require_self
 //= require_directory .
 //= require judge/utils.js
 //= require judge/diff.js
 //= require judge/feedbackTable.js
+
+$(function () {
+    if (!Modernizr.templatestrings) {
+        $(".messages").append("<div class='alert alert-warning'>Sorry, je browser lijkt niet alle nodige JavaScript features te ondersteunen. Met een recente versie van Google Chrome of Firefox zou alles moeten werken.</div>")
+    }
+});
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b81ef8bd13..24e5c749ec 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,6 +14,7 @@
   <![endif]-->
 
   <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag :modernizr %>
   <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
 </head>
@@ -37,15 +38,16 @@
     </div>
   </nav>
   <div class="container">
-
-    <% flash.each do |key, value| %>
-      <% unless value.nil? %>
-        <%= content_tag(:div, value, :class => "alert alert-info") if key == "notice" %>
-        <%= content_tag(:div, raw("<strong>Oh snap!</strong> ")+value, :class => "alert alert-danger") if key == "error" %>
-        <%= content_tag(:div, raw("<strong>Opgepast!</strong> ")+value, :class => "alert alert-warning") if key == "alert" %>
-        <%= content_tag(:div, value, :class => "alert alert-success") if key == "success" %>
+    <div class="messages">
+      <% flash.each do |key, value| %>
+        <% unless value.nil? %>
+          <%= content_tag(:div, value, :class => "alert alert-info") if key == "notice" %>
+          <%= content_tag(:div, raw("<strong>Oh snap!</strong> ")+value, :class => "alert alert-danger") if key == "error" %>
+          <%= content_tag(:div, raw("<strong>Opgepast!</strong> ")+value, :class => "alert alert-warning") if key == "alert" %>
+          <%= content_tag(:div, value, :class => "alert alert-success") if key == "success" %>
+        <% end %>
       <% end %>
-    <% end %>
+    </div>
 
     <%= yield %>
   </div>
diff --git a/vendor/assets/javascripts/modernizr/modernizr.min.js b/vendor/assets/javascripts/modernizr/modernizr.min.js
new file mode 100644
index 0000000000..8fb21a7b45
--- /dev/null
+++ b/vendor/assets/javascripts/modernizr/modernizr.min.js
@@ -0,0 +1,3 @@
+/*! modernizr 3.3.1 (Custom Build) | MIT *
+ * http://modernizr.com/download/?-templatestrings !*/
+!function(window,document,undefined){function is(n,e){return typeof n===e}function testRunner(){var n,e,o,r,s,t,i;for(var a in tests)if(tests.hasOwnProperty(a)){if(n=[],e=tests[a],e.name&&(n.push(e.name.toLowerCase()),e.options&&e.options.aliases&&e.options.aliases.length))for(o=0;o<e.options.aliases.length;o++)n.push(e.options.aliases[o].toLowerCase());for(r=is(e.fn,"function")?e.fn():e.fn,s=0;s<n.length;s++)t=n[s],i=t.split("."),1===i.length?Modernizr[i[0]]=r:(!Modernizr[i[0]]||Modernizr[i[0]]instanceof Boolean||(Modernizr[i[0]]=new Boolean(Modernizr[i[0]])),Modernizr[i[0]][i[1]]=r),classes.push((r?"":"no-")+i.join("-"))}}var tests=[],ModernizrProto={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(n,e){var o=this;setTimeout(function(){e(o[n])},0)},addTest:function(n,e,o){tests.push({name:n,fn:e,options:o})},addAsyncTest:function(n){tests.push({name:null,fn:n})}},Modernizr=function(){};Modernizr.prototype=ModernizrProto,Modernizr=new Modernizr,Modernizr.addTest("templatestrings",function(){var supports;try{eval("``"),supports=!0}catch(e){}return!!supports});var classes=[];testRunner(),delete ModernizrProto.addTest,delete ModernizrProto.addAsyncTest;for(var i=0;i<Modernizr._q.length;i++)Modernizr._q[i]();window.Modernizr=Modernizr}(window,document);
diff --git a/vendor/assets/javascripts/vendor.js b/vendor/assets/javascripts/vendor.js
new file mode 100644
index 0000000000..cbde0dc883
--- /dev/null
+++ b/vendor/assets/javascripts/vendor.js
@@ -0,0 +1 @@
+//= require modernizr/modernizr.min.js