diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 776d4e03b..a597a504a 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -324,10 +324,11 @@ newCourseForm template = identForm FIDcourse $ \html -> do
           (FormFailure errorMsgs,
                 [whamlet|
                   <div class="alert alert-danger">
-                    <h4> Fehler:
-                    <ul>
-                      $forall errmsg <- errorMsgs
-                        <li> #{errmsg}
+                    <div class="alert__content">
+                      <h4> Fehler:
+                      <ul>
+                        $forall errmsg <- errorMsgs
+                          <li> #{errmsg}
                   ^{widget}
                 |]
               )
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 57e1caa16..997703a1e 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -12,7 +12,7 @@
 
 module Handler.Sheet where
 
-import Import 
+import Import
 import System.FilePath (takeFileName)
 
 import Handler.Utils
@@ -21,10 +21,10 @@ import Handler.Utils.Zip
 -- import Data.Time
 import qualified Data.Text as T
 -- import Data.Function ((&))
--- 
+--
 import Colonnade hiding (fromMaybe, singleton)
 import Yesod.Colonnade
--- 
+--
 import qualified Data.UUID.Cryptographic as UUID
 import qualified Data.Conduit.List as C
 
@@ -44,7 +44,7 @@ instance Eq (Unique Sheet) where
 
 {-
   * Implement Handlers
-  * Implement Breadcrumbs in Foundation 
+  * Implement Breadcrumbs in Foundation
   * Implement Access in Foundation
 -}
 
@@ -76,7 +76,7 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do
                    E.&&. sheetFile E.^. SheetFileType    E.==. E.val fType
               return (file E.^. FileId)
           | otherwise = return Set.empty
-  
+
     (result, widget) <- flip (renderAForm FormStandard) html $ SheetForm
       <$> areq textField      (fsb "Name")                     (sfName <$> template)
       <*> aopt htmlField      (fsb "Hinweise für Teilnehmer")  (sfDescription <$> template)
@@ -100,10 +100,11 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do
             (FormFailure errorMsgs,
                   [whamlet|
                     <div class="alert alert-danger">
-                      <h4> Fehler:
-                      <ul>
-                        $forall errmsg <- errorMsgs
-                          <li> #{errmsg}
+                      <div class="alert__content">
+                        <h4> Fehler:
+                        <ul>
+                          $forall errmsg <- errorMsgs
+                            <li> #{errmsg}
                     ^{widget}
                   |]
                 )
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index a6942d85f..bc8938ef3 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -149,10 +149,11 @@ newTermForm template html = do
           (FormFailure errorMsgs,
                 [whamlet|
                   <div class="alert alert-danger">
-                    <h4> Fehler:
-                    <ul>
-                      $forall errmsg <- errorMsgs
-                        <li> #{errmsg}
+                    <div class="alert__content">
+                      <h4> Fehler:
+                      <ul>
+                        $forall errmsg <- errorMsgs
+                          <li> #{errmsg}
                   ^{widget}
                 |]
               )
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 39586cb46..5f81f4e07 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -23,8 +23,8 @@
     $forall (status, msg) <- mmsgs
       $with status2 <- bool status "info" (status == "")
         <div class="alert alert-#{status2}">
-          <div .alert__content>#{msg}
-          <div .alert__close>_{MsgCloseAlert}
+          <div .alert__content>
+            #{msg}
 
     <!-- actual content -->
 
diff --git a/templates/home.hamlet b/templates/home.hamlet
index 69435db5c..f57e6d570 100644
--- a/templates/home.hamlet
+++ b/templates/home.hamlet
@@ -6,7 +6,8 @@
     Die Reimplementierung von
     UniWorX ist noch nicht abgeschlossen.
 
-  <p .alert .alert-danger>Das System ist noch nicht produktiv einsetzbar
+  <div .alert .alert-danger>
+    <div .alert__content>Das System ist noch nicht produktiv einsetzbar
 
 <hr>
 <div .container>
diff --git a/templates/standalone/alerts.julius b/templates/standalone/alerts.julius
index 253db2674..f32962cb7 100644
--- a/templates/standalone/alerts.julius
+++ b/templates/standalone/alerts.julius
@@ -4,9 +4,14 @@
   window.utils = window.utils || {};
 
   window.utils.alert = function(alertEl) {
-    alertEl.querySelector('.alert__close').addEventListener('click', function(event) {
+    var closeEl = document.createElement('DIV');
+    closeEl.classList.add('alert__close');
+    // TODO: fix this. How to request translation in *.julius .files?
+    closeEl.innerText = "_{MsgCloseAlert}";
+    closeEl.addEventListener('click', function(event) {
       alertEl.classList.add('alert--invisible');
     });
+    alertEl.appendChild(closeEl);
   }
 
 })();
diff --git a/templates/standalone/alerts.lucius b/templates/standalone/alerts.lucius
index e5ddc7b1f..69869d997 100644
--- a/templates/standalone/alerts.lucius
+++ b/templates/standalone/alerts.lucius
@@ -56,6 +56,7 @@
   }
 }
 
+.alert-danger,
 .alert-error {
   border-color: var(--color-error);
   background-color: #fff5f7;