diff --git a/package-lock.json b/package-lock.json
index cf752c1..dd03f1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "5.1.3",
+    "version": "5.1.4",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index de36454..9b82478 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "5.1.3",
+    "version": "5.1.4",
     "description": "Set of components and utils for Foris and its plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {
diff --git a/src/bootstrap/Alert.js b/src/bootstrap/Alert.js
index f460931..d0f3acc 100644
--- a/src/bootstrap/Alert.js
+++ b/src/bootstrap/Alert.js
@@ -37,7 +37,11 @@ Alert.defaultProps = {
 
 export function Alert({ type, onDismiss, children }) {
     return (
-        <div className={`alert alert-dismissible alert-${type}`}>
+        <div
+            className={`alert ${
+                onDismiss ? "alert-dismissible" : ""
+            } alert-${type}`}
+        >
             {onDismiss ? (
                 <button type="button" className="close" onClick={onDismiss}>
                     &times;
diff --git a/src/bootstrap/Modal.js b/src/bootstrap/Modal.js
index 5c080c9..96f1fef 100644
--- a/src/bootstrap/Modal.js
+++ b/src/bootstrap/Modal.js
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
  */
 
-import React, { useRef } from "react";
+import React, { useRef, useEffect } from "react";
 import PropTypes from "prop-types";
 
 import { Portal } from "../utils/Portal";
@@ -31,6 +31,19 @@ export function Modal({ shown, setShown, scrollable, children }) {
 
     useClickOutside(dialogRef, () => setShown(false));
 
+    useEffect(() => {
+        const handleEsc = (event) => {
+            if (event.keyCode === 27) {
+                setShown(false);
+            }
+        };
+        window.addEventListener("keydown", handleEsc);
+
+        return () => {
+            window.removeEventListener("keydown", handleEsc);
+        };
+    }, [setShown]);
+
     return (
         <Portal containerId="modal-container">
             <div className={`modal fade ${shown ? "show" : ""}`} role="dialog">
diff --git a/src/common/RebootButton.js b/src/common/RebootButton.js
index b72a06c..fbd16a8 100644
--- a/src/common/RebootButton.js
+++ b/src/common/RebootButton.js
@@ -63,7 +63,7 @@ RebootModal.propTypes = {
 function RebootModal({ shown, setShown, onReboot }) {
     return (
         <Modal shown={shown} setShown={setShown}>
-            <ModalHeader setShown={setShown} title={_("Reboot confirmation")} />
+            <ModalHeader setShown={setShown} title={_("Warning!")} />
             <ModalBody>
                 <p>{_("Are you sure you want to restart the router?")}</p>
             </ModalBody>
diff --git a/src/common/WiFiSettings/WiFiForm.js b/src/common/WiFiSettings/WiFiForm.js
index 63bfd47..b686c1c 100644
--- a/src/common/WiFiSettings/WiFiForm.js
+++ b/src/common/WiFiSettings/WiFiForm.js
@@ -157,6 +157,7 @@ function DeviceForm({
                         choices={getHwmodeChoices(formData)}
                         value={formData.hwmode}
                         helpText={HELP_TEXTS.hwmode}
+                        inline
                         onChange={setFormValue((value) => ({
                             devices: {
                                 [deviceIndex]: {
diff --git a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
index 8a24692..204d76f 100644
--- a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
+++ b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
@@ -570,7 +570,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           GHz
 +         </label>
 +         <div
-+           class=\\"custom-control custom-radio\\"
++           class=\\"custom-control custom-radio custom-control-inline\\"
 +         >
 +           <input
 +             class=\\"custom-control-input\\"
@@ -587,7 +587,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           </label>
 +         </div>
 +         <div
-+           class=\\"custom-control custom-radio\\"
++           class=\\"custom-control custom-radio custom-control-inline\\"
 +         >
 +           <input
 +             checked=\\"\\"
diff --git a/src/common/__tests__/__snapshots__/RebootButton.test.js.snap b/src/common/__tests__/__snapshots__/RebootButton.test.js.snap
index 37279f7..1a2ced3 100644
--- a/src/common/__tests__/__snapshots__/RebootButton.test.js.snap
+++ b/src/common/__tests__/__snapshots__/RebootButton.test.js.snap
@@ -22,7 +22,7 @@ exports[`<RebootButton/> Render modal. 1`] = `
             <h5
               class="modal-title"
             >
-              Reboot confirmation
+              Warning!
             </h5>
             <button
               class="close"