diff --git a/package.json b/package.json
index 32f38f2..e711e95 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "bluelib",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "license": "AGPL-3.0-or-later",
   "source": "src/index.js",
   "main": "dist/index.js",
diff --git a/src/components/Layout/HButton.js b/src/components/Layout/HButton.js
new file mode 100644
index 0000000..fd8b61e
--- /dev/null
+++ b/src/components/Layout/HButton.js
@@ -0,0 +1,16 @@
+import style from './HButton.less';
+
+export default function (props) {
+	return (
+		<label className={style.label}>
+			<div className={style.text}>{props.label}</div>
+			<button
+				onClick={props.disabled ? null : props.onClick}
+				className={style.button}
+				disabled={props.disabled}
+			>
+				{props.children}
+			</button>
+		</label>
+	);
+}
diff --git a/src/components/Layout/HButton.less b/src/components/Layout/HButton.less
new file mode 100644
index 0000000..595abd1
--- /dev/null
+++ b/src/components/Layout/HButton.less
@@ -0,0 +1,21 @@
+@import "../../styles/constants.less";
+
+.label {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+.text {
+    flex-grow: 1;
+    max-width: 160px;
+    text-align: right;
+    margin-right: 4px;
+}
+
+.button {
+    margin-left: 4px;
+    flex-grow: 2;
+}
diff --git a/src/components/Layout/HInput.js b/src/components/Layout/HInput.js
index afd6c48..9d44306 100644
--- a/src/components/Layout/HInput.js
+++ b/src/components/Layout/HInput.js
@@ -3,9 +3,9 @@ import style from './HInput.less';
 export default function (props) {
 	return (
 		<label className={style.label}>
-			<div className={style.text}>{this.props.label}</div>
-			<input className={style.input} type={this.props.type} value={this.props.value}
-				   onChange={this.props.onChange} disabled={this.props.disabled} name={this.props.name}/>
+			<div className={style.text}>{props.label}</div>
+			<input className={style.input} type={props.type} value={props.value}
+				   onChange={props.onChange} disabled={props.disabled} name={props.name}/>
 		</label>
 	);
 }