diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index f6f1800dc..1fdab732f 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -32,13 +32,15 @@
 		    <script type="text/javascript" src="{% static "pretixcontrol/js/ui/main.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/quota.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/question.js" %}"></script>
+            <script type="text/javascript" src="{% static "pretixbase/js/asynctask.js" %}"></script>
+            <script type="text/javascript" src="{% static "pretixbase/js/asyncdownload.js" %}"></script>
 		{% endcompress %}
         {{ html_head|safe }}
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="icon" href="{% static "pretixbase/img/favicon.ico" %}">
 	</head>
 	<body data-datetimeformat="{{ js_datetime_format }}" data-dateformat="{{ js_date_format }}" data-datetimelocale="{{ js_locale }}" data-payment-weekdays-disabled="{{ js_payment_weekdays_disabled }}">
-        <div id="#wrapper">
+        <div id="wrapper">
             <nav class="navbar navbar-inverse navbar-static-top" role="navigation">
                 <div class="navbar-header">
                     <button type="button" class="navbar-toggle"
diff --git a/src/pretix/presale/templates/pretixpresale/base.html b/src/pretix/presale/templates/pretixpresale/base.html
index 492232278..e83c3f663 100644
--- a/src/pretix/presale/templates/pretixpresale/base.html
+++ b/src/pretix/presale/templates/pretixpresale/base.html
@@ -24,8 +24,8 @@
         <script type="text/javascript" src="{% static "js/jquery.formset.js" %}"></script>
         <script type="text/javascript" src="{% static "bootstrap/js/bootstrap.js" %}"></script>
         <script type="text/javascript" src="{% static "pretixpresale/js/ui/main.js" %}"></script>
-        <script type="text/javascript" src="{% static "pretixpresale/js/ui/asynctask.js" %}"></script>
-        <script type="text/javascript" src="{% static "pretixpresale/js/ui/asyncdownload.js" %}"></script>
+        <script type="text/javascript" src="{% static "pretixbase/js/asynctask.js" %}"></script>
+        <script type="text/javascript" src="{% static "pretixbase/js/asyncdownload.js" %}"></script>
         <script type="text/javascript" src="{% static "pretixpresale/js/ui/cart.js" %}"></script>
         <script type="text/javascript" src="{% static "lightbox/js/lightbox.min.js" %}"></script>
     {% endcompress %}
diff --git a/src/pretix/static/pretixpresale/js/ui/asyncdownload.js b/src/pretix/static/pretixbase/js/asyncdownload.js
similarity index 100%
rename from src/pretix/static/pretixpresale/js/ui/asyncdownload.js
rename to src/pretix/static/pretixbase/js/asyncdownload.js
diff --git a/src/pretix/static/pretixpresale/js/ui/asynctask.js b/src/pretix/static/pretixbase/js/asynctask.js
similarity index 87%
rename from src/pretix/static/pretixpresale/js/ui/asynctask.js
rename to src/pretix/static/pretixbase/js/asynctask.js
index 719130bdb..b8ec0d9d7 100644
--- a/src/pretix/static/pretixpresale/js/ui/asynctask.js
+++ b/src/pretix/static/pretixbase/js/asynctask.js
@@ -119,3 +119,29 @@ $(function () {
         );
     });
 });
+
+var waitingDialog = {
+    show: function (message) {
+        "use strict";
+        $("#loadingmodal").find("h1").html(message);
+        $("body").addClass("loading");
+    },
+    hide: function () {
+        "use strict";
+        $("body").removeClass("loading");
+    }
+};
+
+var ajaxErrDialog = {
+    show: function (c) {
+        "use strict";
+        $("#ajaxerr").html(c);
+        $("#ajaxerr .links").html("<a class='btn btn-default ajaxerr-close'>"
+                                  + gettext("Close message") + "</a>");
+        $("body").addClass("ajaxerr");
+    },
+    hide: function () {
+        "use strict";
+        $("body").removeClass("ajaxerr");
+    }
+};
diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss
index 9c7a1bc0f..825f391b7 100644
--- a/src/pretix/static/pretixcontrol/scss/main.scss
+++ b/src/pretix/static/pretixcontrol/scss/main.scss
@@ -142,6 +142,14 @@ h1 .btn-sm {
     }
 }
 
+body.loading #wrapper {
+    -webkit-filter: blur(2px);
+    -moz-filter: blur(2px);
+    -ms-filter: blur(2px);
+    -o-filter: blur(2px);
+    filter: blur(2px);
+}
+
 #loadingmodal, #ajaxerr {
     position: fixed;
     top: 0;
@@ -153,6 +161,7 @@ h1 .btn-sm {
     text-align: center;
     z-index: 900000;
     visibility: hidden;
+    padding: 10px;
 
     .big-icon {
         margin-top: 50px;
diff --git a/src/pretix/static/pretixpresale/js/ui/main.js b/src/pretix/static/pretixpresale/js/ui/main.js
index 7ea07aadd..671db2037 100644
--- a/src/pretix/static/pretixpresale/js/ui/main.js
+++ b/src/pretix/static/pretixpresale/js/ui/main.js
@@ -78,29 +78,3 @@ function copy_answers(idx) {
         } 
     });
 }
-
-var waitingDialog = {
-    show: function (message) {
-        "use strict";
-        $("#loadingmodal").find("h1").html(message);
-        $("body").addClass("loading");
-    },
-    hide: function () {
-        "use strict";
-        $("body").removeClass("loading");
-    }
-};
-
-var ajaxErrDialog = {
-    show: function (c) {
-        "use strict";
-        $("#ajaxerr").html(c);
-        $("#ajaxerr .links").html("<a class='btn btn-default ajaxerr-close'>"
-                                  + gettext("Close message") + "</a>");
-        $("body").addClass("ajaxerr");
-    },
-    hide: function () {
-        "use strict";
-        $("body").removeClass("ajaxerr");
-    }
-};
