diff --git a/javascript/src/Alert.js b/javascript/src/Alert.js
index 0fc74d22c672e3ebb3e772b1660049f09158be31..2341e567405e31601b1bdd4f830f6591e50bfc51 100644
--- a/javascript/src/Alert.js
+++ b/javascript/src/Alert.js
@@ -130,6 +130,7 @@ var QfqNS = QfqNS || {};
         if (alertContainer.length === 0) {
             // No container so far, create one
             alertContainer = $("<div>").attr("id", n.Alert.constants.alertContainerId);
+
             $("body").append(alertContainer);
         }
 
@@ -178,6 +179,7 @@ var QfqNS = QfqNS || {};
      */
     n.Alert.prototype.getButtons = function () {
         var $buttons = null;
+        var $container = $("<div>").addClass("alert-buttons");
         var numberOfButtons = this.buttons.length;
         var index;
         var buttonConfiguration;
@@ -186,7 +188,11 @@ var QfqNS = QfqNS || {};
             buttonConfiguration = this.buttons[index];
 
             if (!$buttons) {
-                $buttons = $("<div>").addClass("alert-buttons");
+                if (numberOfButtons > 1) {
+                    $buttons = $("<div>").addClass("btn-group");
+                } else {
+                    $buttons = $container;
+                }
             }
 
             var focus = buttonConfiguration.focus ? buttonConfiguration.focus : false;
@@ -197,6 +203,11 @@ var QfqNS = QfqNS || {};
                 .click(buttonConfiguration, this.buttonHandler.bind(this)));
         }
 
+        if (numberOfButtons > 1) {
+            $container.append($buttons);
+            $buttons = $container;
+        }
+
         return $buttons;
     };
 
@@ -215,7 +226,7 @@ var QfqNS = QfqNS || {};
         $alertContainer = this.makeAlertContainerSingleton();
         if (this.modal) {
             this.$modalDiv = $("<div>");
-            this.$modalDiv.css('width', Math.max(document.documentElement.clientWidth, window.innerWidth || 0));
+            this.$modalDiv.css('width', "100%");
             this.$modalDiv.css('height', Math.max(document.documentElement.clientHeight, window.innerHeight || 0));
         }
 
diff --git a/less/qfq-bs.css.less b/less/qfq-bs.css.less
index f40a3f288278211c35ff4cbf82bc048008020519..26bef3443e167191ae7fd4b77d6a04e4b9642467 100644
--- a/less/qfq-bs.css.less
+++ b/less/qfq-bs.css.less
@@ -12,7 +12,12 @@
   z-index: 1000;
 
   .alert {
+    padding: 30px;
+    border-radius: 0px;
     margin-bottom: 2px;
+    border-top: none;
+    border-left: none;
+    border-right: none;
   }
 }
 
@@ -25,6 +30,10 @@ i.@{spinner_class} {
   width: 16px;
 }
 
+.alert-buttons {
+  margin-top: 10px;
+}
+
 /*inline elements in horizontal mode are too much left*/
 .form-horizontal {
   .form-inline {