diff --git a/webserver/static/styles/index.css b/webserver/static/styles/index.css
index a3b8d7a..7925c56 100644
--- a/webserver/static/styles/index.css
+++ b/webserver/static/styles/index.css
@@ -33,10 +33,11 @@ body {
   display: none;
 }
 
-/* Smartphones ----------- */
-@media only screen and (max-width: 760px) {
-  .mobile-warn {
-    display: block;
-  }
+.mobile-warn.show {
+  display: block;
+}
+
+.mobile-warn > strong {
+  margin-right: 5px;
 }
 /*# sourceMappingURL=index.css.map */
diff --git a/webserver/templates/base.html b/webserver/templates/base.html
index bb7117a..eb3ccb0 100644
--- a/webserver/templates/base.html
+++ b/webserver/templates/base.html
@@ -16,6 +16,8 @@
 
         gtag('config', 'UA-117913368-1');
     </script>
+    {% block head %}
+    {% endblock %}
 </head>
 <body>
 <div class="container text-center">
@@ -49,4 +51,4 @@
 </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webserver/templates/login.html b/webserver/templates/login.html
index eff38bd..7d32ff6 100644
--- a/webserver/templates/login.html
+++ b/webserver/templates/login.html
@@ -1,7 +1,26 @@
 {% extends "base.html" %}
+
+{% block head %}
+           <script charset="utf-8">
+function mobilecheck() {
+  var check = false;
+  (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
+  return check;
+};
+
+document.addEventListener('DOMContentLoaded', function(){ 
+   var div = document.getElementById('mobile-warn');
+   if(mobilecheck()) {
+       div.className += ' show';
+   }
+}, false);
+
+           </script>
+
+{% endblock %}
 {% block popup %}
-            <div class="alert alert-warning mobile-warn" role="alert">
-                <strong>Notice!</strong> this application isn't optimized for mobile browsing
+            <div id="mobile-warn" class="alert alert-warning mobile-warn" role="alert">
+                <strong>Notice!</strong>  The Web-App is not yet optimized for mobile devices.
             </div>
             <form role="form" class='form-horizontal' name="login_form" action="/create_user" method="post">
                 <div class="form-group">
